Fossil SCM
Rename a new routine for consistent naming in the http_socket.c source file.
Commit
fa63c944223a1031affa9c8fc81f1d0c16860bb7ffc1305be6def42e680d0646
Parent
e7386bb0b5b0584…
2 files changed
+2
-3
+1
-1
+2
-3
| --- src/http_socket.c | ||
| +++ src/http_socket.c | ||
| @@ -89,14 +89,13 @@ | ||
| 89 | 89 | socketErrMsg = 0; |
| 90 | 90 | return zResult; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /* |
| 94 | -** Return the socket to the caller. | |
| 95 | -** This can be used when setting up SSL on the socket. | |
| 94 | +** Return the file descriptor for the open socket. | |
| 96 | 95 | */ |
| 97 | -int get_socket(){ | |
| 96 | +int socket_get_fd(){ | |
| 98 | 97 | return iSocket; |
| 99 | 98 | } |
| 100 | 99 | |
| 101 | 100 | /* |
| 102 | 101 | ** Call this routine once before any other use of the socket interface. |
| 103 | 102 |
| --- src/http_socket.c | |
| +++ src/http_socket.c | |
| @@ -89,14 +89,13 @@ | |
| 89 | socketErrMsg = 0; |
| 90 | return zResult; |
| 91 | } |
| 92 | |
| 93 | /* |
| 94 | ** Return the socket to the caller. |
| 95 | ** This can be used when setting up SSL on the socket. |
| 96 | */ |
| 97 | int get_socket(){ |
| 98 | return iSocket; |
| 99 | } |
| 100 | |
| 101 | /* |
| 102 | ** Call this routine once before any other use of the socket interface. |
| 103 |
| --- src/http_socket.c | |
| +++ src/http_socket.c | |
| @@ -89,14 +89,13 @@ | |
| 89 | socketErrMsg = 0; |
| 90 | return zResult; |
| 91 | } |
| 92 | |
| 93 | /* |
| 94 | ** Return the file descriptor for the open socket. |
| 95 | */ |
| 96 | int socket_get_fd(){ |
| 97 | return iSocket; |
| 98 | } |
| 99 | |
| 100 | /* |
| 101 | ** Call this routine once before any other use of the socket interface. |
| 102 |
+1
-1
| --- src/http_ssl.c | ||
| +++ src/http_ssl.c | ||
| @@ -459,11 +459,11 @@ | ||
| 459 | 459 | ssl_global_init_client(); |
| 460 | 460 | if( socket_open(pUrlData) ){ |
| 461 | 461 | ssl_set_errmsg("SSL: cannot open socket (%s)", socket_errmsg()); |
| 462 | 462 | return 1; |
| 463 | 463 | } |
| 464 | - sBio = BIO_new_socket(get_socket(), 0); | |
| 464 | + sBio = BIO_new_socket(socket_get_fd(), 0); | |
| 465 | 465 | if( pUrlData->useProxy ){ |
| 466 | 466 | int rc = establish_proxy_tunnel(pUrlData, sBio); |
| 467 | 467 | if( rc<200||rc>299 ){ |
| 468 | 468 | ssl_set_errmsg("SSL: proxy connect failed with HTTP status code %d", rc); |
| 469 | 469 | ssl_close_client(); |
| 470 | 470 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -459,11 +459,11 @@ | |
| 459 | ssl_global_init_client(); |
| 460 | if( socket_open(pUrlData) ){ |
| 461 | ssl_set_errmsg("SSL: cannot open socket (%s)", socket_errmsg()); |
| 462 | return 1; |
| 463 | } |
| 464 | sBio = BIO_new_socket(get_socket(), 0); |
| 465 | if( pUrlData->useProxy ){ |
| 466 | int rc = establish_proxy_tunnel(pUrlData, sBio); |
| 467 | if( rc<200||rc>299 ){ |
| 468 | ssl_set_errmsg("SSL: proxy connect failed with HTTP status code %d", rc); |
| 469 | ssl_close_client(); |
| 470 |
| --- src/http_ssl.c | |
| +++ src/http_ssl.c | |
| @@ -459,11 +459,11 @@ | |
| 459 | ssl_global_init_client(); |
| 460 | if( socket_open(pUrlData) ){ |
| 461 | ssl_set_errmsg("SSL: cannot open socket (%s)", socket_errmsg()); |
| 462 | return 1; |
| 463 | } |
| 464 | sBio = BIO_new_socket(socket_get_fd(), 0); |
| 465 | if( pUrlData->useProxy ){ |
| 466 | int rc = establish_proxy_tunnel(pUrlData, sBio); |
| 467 | if( rc<200||rc>299 ){ |
| 468 | ssl_set_errmsg("SSL: proxy connect failed with HTTP status code %d", rc); |
| 469 | ssl_close_client(); |
| 470 |