X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=f68f57e3d6aed62b6a6fec835f46e94ae3b1b286;hp=9cb81bace763d597f2764240f39f8bba021d86c4;hb=68a779badeace396e3a86caf9cb86b7e70ff636a;hpb=f778b367166bb5fc34a9a1807a8a50835a4a262c

diff --git a/http_api.c b/http_api.c
index 9cb81ba..f68f57e 100644
--- a/http_api.c
+++ b/http_api.c
@@ -1669,8 +1669,8 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 }
 /* }}} */
 
-/* {{{ proto void http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
+/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */
+PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
 	zval *zbody TSRMLS_DC)
 {
 	char *header, *response, *body = NULL;
@@ -1693,42 +1693,56 @@ PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
 		Z_TYPE_P(zbody) = IS_NULL;
 	}
 
-	/* check for HTTP status - FIXXME: strchr() */
+	return http_parse_header(header, body - Z_STRVAL_P(zresponse), zheaders);
+}
+/* }}} */
+
+/* {{{ STATUS http_parse_header(char *, long, zval *) */
+PHP_HTTP_API STATUS _http_parse_header(char *header, long header_len, zval *array TSRMLS_DC)
+{
+	char *colon = NULL, *line = NULL, *begin = header;
+
+	if (header_len < 8) {
+		return FAILURE;
+	}
+
+	/* status code */
 	if (!strncmp(header, "HTTP/1.", 7)) {
-		char *end = strchr(header, '\r');
-		add_assoc_stringl(zheaders, "Status",
+		char *end = strstr(header, "\r\n");
+		add_assoc_stringl(array, "Status",
 			header + strlen("HTTP/1.x "),
 			end - (header + strlen("HTTP/1.x ")), 1);
 		header = end + 2;
 	}
-	/* split headers */
-	{
-		char *colon = NULL, *line = header;
 
-		while (	(line - Z_STRVAL_P(zresponse) + 3) <
-				(body - Z_STRVAL_P(zresponse))) {
-			switch (*line++)
-			{
-				case '\r':
-					if (colon && (*line == '\n')) {
-						char *key = estrndup(header, colon - header);
-						add_assoc_stringl(zheaders, key,
-							colon + 2, line - colon - 3, 1);
-						efree(key);
-
-						colon = NULL;
-						header += line - header + 1;
-					}
-				break;
+	line = header;
 
-				case ':':
-					if (!colon) {
-						colon = line - 1;
-					}
-				break;
-			}
+	/*
+	 * FIXXME: support for folded headers
+	 */
+	while (header_len > (line - begin)) {
+		switch (*line++)
+		{
+			case 0:
+			case '\r':
+				if (colon && (*line == '\n')) {
+					char *key = estrndup(header, colon - header);
+					add_assoc_stringl(array, key, colon + 2, line - colon - 3, 1);
+					efree(key);
+
+					colon = NULL;
+					header += line - header + 1;
+				}
+			break;
+
+			case ':':
+				if (!colon) {
+					colon = line - 1;
+				}
+			break;
 		}
 	}
+	return SUCCESS;
 }
 /* }}} */