Merge pull request #67 from mchalain/master

prerelease 2.9

Author: mchalain

Makefile

@@ -1,7 +1,7 @@
 include scripts.mk
 
 package?=httpserver
-version=2.5
+version=2.9
 
 ifeq ($(VTHREAD_TYPE),pthread)
 USE_PTHREAD=y

include/httpserver/httpserver.h

@@ -166,11 +166,14 @@ typedef int (*http_send_t)(void *ctx, const char *data, int length);
 typedef void (*http_disconnect_t)(void *ctx);
 typedef void (*http_destroy_t)(void *ctx);
 
+#define HTTPCLIENT_TYPE_SECURE 0x0001
+
 typedef struct httpclient_ops_s httpclient_ops_t;
 struct httpclient_ops_s
 {
 	const char *scheme;
 	int default_port;
+	int type;
 	http_create_t create;
 	http_connect_t connect; /* callback to connect on an external server */
 	http_recv_t recvreq; /* callback to receive data on the socket */
@@ -725,14 +728,6 @@ void httpclient_shutdown(http_client_t *client);
 #define WAIT_ACCEPT 0x02
 int httpclient_wait(http_client_t *client, int options);
 
-typedef void *(*module_create_t)(http_server_t *server, void *config);
-typedef struct module_s
-{
-	const char *name;
-	void *(*create)(http_server_t *server, void *config);
-	void (*destroy)(void*);
-} module_t;
-
 #ifdef __cplusplus
 }
 #endif

src/httpserver/_httpserver.h

@@ -89,11 +89,7 @@ struct http_client_s
 	buffer_t *sockdata;
 
 	http_server_session_t *session;
-#if defined USE_IPV6
-	struct sockaddr_in6 addr;
-#else
-	struct sockaddr_in addr;
-#endif
+	struct sockaddr_storage addr;
 	unsigned int addr_size;
 	struct http_client_s *next;
 };

src/httpserver/httpserver.c

@@ -158,6 +158,7 @@ const char str_defaultscheme[] = "http";
 const char str_form_urlencoded[] = "application/x-www-form-urlencoded";
 const char str_cookie[] = "Cookie";
 const char str_true[] = "true";
+const char str_false[] = "false";
 
 static char _httpserver_software[] = "libhttpserver";
 char *httpserver_software = _httpserver_software;
@@ -1032,9 +1033,9 @@ static int _httpmessage_parseprecontent(http_message_t *message, buffer_t *data)
 	if (message->query)
 		length = strlen(message->query);
 
-	if (message->method->properties == MESSAGE_ALLOW_CONTENT &&
+	if ((message->method->properties & MESSAGE_ALLOW_CONTENT) &&
 		message->content_type != NULL &&
-		!strcmp(message->content_type, str_form_urlencoded))
+		!strncasecmp(message->content_type, str_form_urlencoded, sizeof(str_form_urlencoded) - 1))
 	{
 		next = PARSE_POSTCONTENT;
 		message->state &= ~PARSE_CONTINUE;
@@ -2759,6 +2760,7 @@ static int _httpclient_run(http_client_t *client)
 			{
 				ret = ECONTINUE;
 				client->request_queue = request->next;
+
 				if ((request->state & PARSE_MASK) < PARSE_END)
 				{
 					dbg("client: uncomplete");
@@ -2776,6 +2778,12 @@ static int _httpclient_run(http_client_t *client)
 					client->state = CLIENT_EXIT | (client->state & ~CLIENT_MACHINEMASK);
 					ret = EINCOMPLETE;
 				}
+				else if (httpmessage_result(request->response, -1) > 299)
+				{
+					dbg("client: exit on result");
+					client->state = CLIENT_EXIT | (client->state & ~CLIENT_MACHINEMASK);
+					ret = EINCOMPLETE;
+				}
 				else
 				{
 					dbg("client: keep alive");
@@ -3617,6 +3625,13 @@ const char *httpserver_INFO(http_server_t *server, const char *key)
 		snprintf(service, NI_MAXSERV, "%d", server->protocol_ops->default_port);
 		value = service;
 	}
+	else if (!strcasecmp(key, "secure"))
+	{
+		if (server->protocol_ops->type & HTTPCLIENT_TYPE_SECURE)
+			value = str_true;
+		else
+			value = str_false;
+	}
 	else if (!strcasecmp(key, "port"))
 	{
 #if 1

src/utils.c

@@ -219,58 +219,52 @@ int utils_searchexp(const char *haystack, const char *needleslist, const char **
 static int _utils_searchexp(const char *haystack, const char *needleslist, int ignore_case, const char **rest)
 {
 	int ret = EREJECT;
+	if (needleslist == NULL || needleslist[0] == '\0')
+		return ret;
 	if (haystack != NULL)
 	{
 		int i = -1;
 		const char *needle = needleslist;
 		while (needle != NULL)
 		{
-			i = -1;
+			i = 0;
 			ret = ECONTINUE;
-			int wildcard = 1;
+			const char *wildcard = &(haystack[i]);
 			if (*needle == '^')
 			{
-				wildcard = 0;
+				wildcard = NULL;
+				needle++;
 			}
 			const char *needle_entry = needle;
 			do
 			{
+				utils_dbg("wildcard %s needle %s, haystack %s", wildcard, needle, &haystack[i]);
+				char hay = haystack[i];
 				if (*needle == '*')
 				{
-					wildcard = 1;
+					wildcard = &(haystack[i]);
 					needle++;
 				}
-				i++;
-				char hay = haystack[i];
 				// lowercase
 				if (ignore_case && hay > 0x40 && hay < 0x5b)
 					hay += 0x20;
-				utils_dbg("wildcard %d, needle %s, haystack %s", wildcard, needle, &haystack[i]);
-				if (!wildcard)
+				if (wildcard == NULL)
 				{
-					needle++;
 					char lneedle = *needle;
 					if (ignore_case && lneedle > 0x40 && lneedle < 0x5b)
 						lneedle += 0x20;
-					if (*needle == ',' || *needle == '\0' || *needle == '$')
-					{
-						utils_dbg("end of needle, hay %c", hay);
-						break;
-					}
-					else if (lneedle != hay && *needle != '*')
+					if (lneedle != hay)
 					{
 						utils_dbg("end of needle %c, hay %c",lneedle, hay);
 						needle = needle_entry;
 						ret = EREJECT;
-						if (*needle == '^')
-						{
-							break;
-						}
+						break;
 					}
 					else if (lneedle == hay)
 					{
 						ret = ESUCCESS;
 					}
+					needle++;
 				}
 				else
 				{
@@ -281,13 +275,16 @@ static int _utils_searchexp(const char *haystack, const char *needleslist, int i
 					ret = ESUCCESS;
 					if (lneedle == hay)
 					{
-						wildcard = 0;
-					}
-					else if (*needle == ',' || *needle == '\0')
-					{
-						break;
+						wildcard = NULL;
+						needle++;
 					}
 				}
+				i++;
+				if (*needle == ',' || *needle == '\0' || *needle == '$')
+				{
+					utils_dbg("end of needle %c, hay %c", *needle, hay);
+					break;
+				}
 			}
 			while(haystack[i] != '\0');
 			if (*needle == '*' && haystack[i] != '\0')
@@ -305,8 +302,8 @@ static int _utils_searchexp(const char *haystack, const char *needleslist, int i
 			{
 				if (*needle == ',' || *needle == '\0' || *needle == '$')
 				{
-					if (wildcard && (rest != NULL))
-						*rest = &haystack[i - 1];
+					if (wildcard && (*needle != '$') && (rest != NULL))
+						*rest = wildcard;
 					break;
 				}
 				else if (*needle != '*')