Fix HTTP transfer-encoding:chunk. Fixed some missing connect_issued f…

…lag updates. Fixed a missing close-socket path in HTTPS flow.
d3x0r · Oct 6, 2024 · b3cec8d · b3cec8d
1 parent 696dddc
commit b3cec8d
Show file tree

Hide file tree

Showing 5 changed files with 182 additions and 141 deletions.
diff --git a/include/http.h b/include/http.h
@@ -80,6 +80,7 @@ struct HTTPRequestOptions {
 	uintptr_t userData;
 	LOGICAL connected; // did get a connect state, so connectError is not checked... (timeout before connect complete?)
 	int connectError;  // feedback to application if there was an error connecting.
+	const char *hostname;
 };
 
 typedef struct HttpState *HTTPState;

diff --git a/src/netlib/network_linux.c b/src/netlib/network_linux.c
@@ -595,6 +595,8 @@ int CPROC ProcessNetworkMessages( struct peer_thread_info *thread, uintptr_t non
 								getsockopt( event_data->pc->Socket, SOL_SOCKET
 									, SO_ERROR
 									, &error, &errlen );
+								// errors like EHOSTUNREACH/ENETUNREACH happen in connect()
+								// and result immediately so they do not get delayed until here.
 								//lprintf( "Error checking for connect is: %s on %p", strerror( error ), event_data->pc );
 								if( event_data->pc->pWaiting ) {
 #ifdef LOG_NOTICES
@@ -606,6 +608,8 @@ int CPROC ProcessNetworkMessages( struct peer_thread_info *thread, uintptr_t non
 								if( error ) {
 									event_data->pc->dwFlags |= CF_CONNECTERROR;
 								}
+								// have to allow SSL to clear this... so set it before calling the connect callback.
+								event_data->pc->dwFlags |= CF_CONNECT_ISSUED;
 								if( event_data->pc->dwFlags & CF_CPPCONNECT ) {
 									if( event_data->pc->connect.CPPThisConnected )
 										event_data->pc->connect.CPPThisConnected( event_data->pc->psvConnect, error );

diff --git a/src/netlib/network_win32.c b/src/netlib/network_win32.c
@@ -272,6 +272,8 @@ static void HandleEvent( PCLIENT pClient )
 							if( globalNetworkData.flags.bLogNotices )
 								lprintf( "Post connect to application %p  error:%d", pClient, wError );
 #endif
+							// have to allow SSL to clear this... so set it before calling the connect callback.
+							pClient->dwFlags |= CF_CONNECT_ISSUED;
 							if( pClient->dwFlags & CF_CPPCONNECT )
 								pClient->connect.CPPThisConnected( pClient->psvConnect, wError );
 							else

diff --git a/src/netlib/ssl_layer.c b/src/netlib/ssl_layer.c
@@ -464,8 +464,7 @@ static void ssl_ReadComplete_( PCLIENT pc, struct ssl_session** ses, POINTER buf
 			if( !( hs_rc = handshake( ses ) ) ) {
 				// zero result is 'needs more data read'
 				if( !ses[0] ) {
-					ses[0]->inUse--;
-					LeaveCriticalSec( &ses[0]->csReadWrite ); //-V522
+					lprintf( "IN handshake, the session disappeared?");
 					return;
 				}
 #ifdef DEBUG_SSL_IO_VERBOSE
@@ -654,17 +653,21 @@ static void ssl_ReadComplete_( PCLIENT pc, struct ssl_session** ses, POINTER buf
 				if( ses[0] ) { // might have closed during read.
 					if( ses[0] && ses[0]->deleteInUse ){
 						//lprintf( "Pending close(3)... was in-use when closed.");
+						ses[0]->inUse--;
+						RemoveClient( pc );
+					}
+					else {
+						EnterCriticalSec( &ses[0]->csReadWrite );
+						goto read_more;
 					}
-					EnterCriticalSec( &ses[0]->csReadWrite );
-					goto read_more;
 				} else {
 					//lprintf( "Session closed during read." );
 				}
 			}
 			else if( len == 0 ) {
 				ses[0]->inUse--;
 #ifdef DEBUG_SSL_IO_VERBOSE
-				lprintf( "incomplete read" );
+				lprintf( "incomplete read (no more data to read)" );
 #endif
 			}