X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a80dbef8bf64db63385db61862d5b77ee10591d7..957731ef89fc1876a0ab8c56d50001011b20abb0:/package/uhttpd/src/uhttpd.c?ds=sidebyside

diff --git a/package/uhttpd/src/uhttpd.c b/package/uhttpd/src/uhttpd.c
index 4a3bced72..9b9608628 100644
--- a/package/uhttpd/src/uhttpd.c
+++ b/package/uhttpd/src/uhttpd.c
@@ -337,11 +337,14 @@ static struct http_request * uh_http_header_parse(struct client *cl, char *buffe
 			}
 
 			/* have name but no value and found a colon, start of value */
-			else if( hdrname && !hdrdata && ((i+2) < buflen) &&
-				(buffer[i] == ':') && (buffer[i+1] == ' ')
+			else if( hdrname && !hdrdata &&
+			    ((i+1) < buflen) && (buffer[i] == ':')
 			) {
 				buffer[i] = 0;
-				hdrdata = &buffer[i+2];
+				hdrdata = &buffer[i+1];
+
+				while ((hdrdata + 1) < (buffer + buflen) && *hdrdata == ' ')
+					hdrdata++;
 			}
 
 			/* have no name and found [A-Za-z], start of name */
@@ -512,7 +515,22 @@ static void uh_mainloop(struct config *conf, fd_set serv_fds, int max_fd)
 #ifdef HAVE_TLS
 							/* setup client tls context */
 							if( conf->tls )
-								conf->tls_accept(cl);
+							{
+								if( conf->tls_accept(cl) < 1 )
+								{
+									fprintf(stderr,
+										"tls_accept failed, "
+										"connection dropped\n");
+
+									/* close client socket */
+									close(new_fd);
+
+									/* remove from global client list */
+									uh_client_remove(new_fd);
+
+									continue;
+								}
+							}
 #endif
 
 							/* add client socket to global fdset */