X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_api.c;h=d8a0828df32ca2bd4f57645bffdbb0e9e2b99648;hb=9c566f3419df4dc202540b2e9ab042bef72263b7;hp=32dc183077ac2639b83bcf2efbb24da08cca61d8;hpb=a5765d1d51e444d9165c591a59d5b4c5bf9294b2;p=m6w6%2Fext-http

diff --git a/http_api.c b/http_api.c
index 32dc183..d8a0828 100644
--- a/http_api.c
+++ b/http_api.c
@@ -15,10 +15,14 @@
 
 /* $Id$ */
 
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <ctype.h>
+
 #include "php.h"
 #include "php_version.h"
 #include "php_streams.h"
@@ -32,22 +36,27 @@
 
 #include "SAPI.h"
 
-#if (PHP_MAJOR_VERSION >= 5)
+#ifdef ZEND_ENGINE_2
 #include "ext/standard/php_http.h"
 #else
-#include "php_http_build_query.h"
 #include "http_build_query.c"
 #endif
 
 #include "php_http.h"
 #include "php_http_api.h"
 
-#include <ctype.h>
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
+
+#ifdef PHP_WIN32
+#include <winsock2.h>
+#include <sys/types.h>
+#endif
+
 #include <curl/curl.h>
 #include <curl/easy.h>
 #endif
 
+
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
 /* {{{ day/month names */
@@ -135,7 +144,7 @@ static int check_month(char *month);
 static int check_tzone(char *tzone);
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
 #define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
 static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC);
 #define http_curl_freebuf(m) _http_curl_freebuf((m) TSRMLS_CC)
@@ -290,7 +299,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 /* }}} */
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
 
 /* {{{ static inline void http_curl_initbuf(http_curlbuf_member) */
 static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC)
@@ -466,12 +475,9 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 	curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1);
 	curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback);
 	curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback);
-#if defined(ZTS)
+#ifdef ZTS
 	curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
 #endif
-#if defined(PHP_DEBUG)
-	curl_easy_setopt(ch, CURLOPT_VERBOSE, 1);
-#endif
 
 	if ((!options) || (1 > zend_hash_num_elements(options))) {
 		return;
@@ -560,7 +566,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 			}
 		}
 		smart_str_0(&qstr);
-		
+
 		if (qstr.c) {
 			curl_easy_setopt(ch, CURLOPT_COOKIE, qstr.c);
 		}
@@ -578,7 +584,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 		char *header_key, header[1024] = {0};
 		zval **header_val;
 		struct curl_slist *headers = NULL;
-		
+
 		zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
 		while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
 			if (key_type == HASH_KEY_IS_STRING) {
@@ -1023,7 +1029,7 @@ PHP_HTTP_API inline zval *_http_get_server_var(const char *key TSRMLS_DC)
 {
 	zval **var;
 	if (SUCCESS == zend_hash_find(
-			Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]),
+			HTTP_SERVER_VARS,
 			(char *) key, strlen(key) + 1, (void **) &var)) {
 		return *var;
 	}
@@ -1046,12 +1052,16 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
 
 	if (mode & PHP_OUTPUT_HANDLER_END) {
 		PHP_MD5Final(digest, &HTTP_G(etag_md5));
-		make_digest(etag, digest);
 
-		if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
-			http_send_status(304);
-		} else {
-			http_send_etag(etag, 32);
+		/* just do that if desired */
+		if (HTTP_G(etag_started)) {
+			make_digest(etag, digest);
+
+			if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+				http_send_status(304);
+			} else {
+				http_send_etag(etag, 32);
+			}
 		}
 	}
 
@@ -1100,19 +1110,22 @@ PHP_HTTP_API int _http_etag_match(const char *entry, const char *etag TSRMLS_DC)
 	} else {
 		result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag));
 	}
-
 	efree(quoted_etag);
 	return result;
 }
 /* }}} */
 
 /* {{{ STATUS http_send_last_modified(int) */
-PHP_HTTP_API STATUS _http_send_last_modified(const int t TSRMLS_DC)
+PHP_HTTP_API STATUS _http_send_last_modified(const time_t t TSRMLS_DC)
 {
 	char modified[96] = "Last-Modified: ", *date;
 	date = http_date(t);
 	strcat(modified, date);
 	efree(date);
+
+	/* remember */
+	HTTP_G(lmod) = t;
+
 	return http_send_header(modified);
 }
 /* }}} */
@@ -1130,6 +1143,13 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag,
 	snprintf(etag_header, header_len, "ETag: \"%s\"", etag);
 	ret = http_send_header(etag_header);
 	efree(etag_header);
+
+	/* remember */
+	if (HTTP_G(etag)) {
+		efree(HTTP_G(etag));
+	}
+	HTTP_G(etag) = estrdup(etag);
+
 	return ret;
 }
 /* }}} */
@@ -1233,7 +1253,7 @@ PHP_HTTP_API char *_http_negotiate_q(const char *entry, const zval *supported,
 		if (NULL != (q_ptr = strrchr(Z_STRVAL_PP(zentry), ';'))) {
 			qual = strtod(q_ptr + 3, NULL);
 		} else {
-			qual = 1000.0 - 1;
+			qual = 1000.0 - i;
 		}
 
 		/* walk through the supported array */
@@ -1271,7 +1291,7 @@ PHP_HTTP_API char *_http_negotiate_q(const char *entry, const zval *supported,
 PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 	const size_t length TSRMLS_DC)
 {
-	zval *zrange, *zentry, **zentries;
+	zval *zrange;
 	char *range, c;
 	long begin = -1, end = -1, *ptr;
 
@@ -1319,6 +1339,10 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 				ptr = &end;
 			break;
 
+			case ' ':
+				/* IE - ignore for now */
+			break;
+
 			case 0:
 			case ',':
 
@@ -1367,17 +1391,18 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 						break;
 					}
 				}
-
-				zentry = (zval *) zentries++;
-				MAKE_STD_ZVAL(zentry);
-				array_init(zentry);
-				add_index_long(zentry, 0, begin);
-				add_index_long(zentry, 1, end);
-				add_next_index_zval(zranges, zentry);
-
-				begin = -1;
-				end = -1;
-				ptr = &begin;
+				{
+					zval *zentry;
+					MAKE_STD_ZVAL(zentry);
+					array_init(zentry);
+					add_index_long(zentry, 0, begin);
+					add_index_long(zentry, 1, end);
+					add_next_index_zval(zranges, zentry);
+
+					begin = -1;
+					end = -1;
+					ptr = &begin;
+				}
 			break;
 
 			default:
@@ -1393,73 +1418,76 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 /* {{{ STATUS http_send_ranges(zval *, void *, size_t, http_send_mode) */
 PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const size_t size, const http_send_mode mode TSRMLS_DC)
 {
+	int c;
+	long **begin, **end;
 	zval **zrange;
-	long b, e, **begin, **end;
-	char range_header[255], multi_header[68] = "Content-Type: multipart/byteranges; boundary=", bound[23], preface[1024];
-	int i, c;
 
 	/* Send HTTP 206 Partial Content */
 	http_send_status(206);
 
 	/* single range */
 	if ((c = zend_hash_num_elements(Z_ARRVAL_P(zranges))) == 1) {
+		char range_header[256] = {0};
+		
 		zend_hash_index_find(Z_ARRVAL_P(zranges), 0, (void **) &zrange);
 		zend_hash_index_find(Z_ARRVAL_PP(zrange), 0, (void **) &begin);
 		zend_hash_index_find(Z_ARRVAL_PP(zrange), 1, (void **) &end);
 
-		/* so zranges can be freed */
-		b = **begin;
-		e = **end;
-
-		/* free zranges */
-		zval_dtor(zranges);
-		efree(zranges);
-
 		/* send content range header */
-		snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", b, e, size);
+		snprintf(range_header, 255, "Content-Range: bytes %d-%d/%d", **begin, **end, size);
 		http_send_header(range_header);
 
 		/* send requested chunk */
-		return http_send_chunk(data, b, e + 1, mode);
+		return http_send_chunk(data, **begin, **end + 1, mode);
 	}
 
 	/* multi range */
-
-	snprintf(bound, 23, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
-	strncat(multi_header, bound + 2, 21);
-	http_send_header(multi_header);
-
-	/* send each requested chunk */
-	for (	i = 0,	zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges));
-			i < c;
-			i++,	zend_hash_move_forward(Z_ARRVAL_P(zranges))) {
-		if (	HASH_KEY_NON_EXISTANT == zend_hash_get_current_data(
-					Z_ARRVAL_P(zranges), (void **) &zrange) ||
-				SUCCESS != zend_hash_index_find(
-					Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
-				SUCCESS != zend_hash_index_find(
-					Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
-			break;
+	else {
+		int i;
+		char bound[23] = {0}, preface[1024] = {0}, 
+			multi_header[68] = "Content-Type: multipart/byteranges; boundary=";
+		
+		snprintf(bound, 22, "--%d%0.9f", time(NULL), php_combined_lcg(TSRMLS_C));
+		strncat(multi_header, bound + 2, 21);
+		http_send_header(multi_header);
+
+		/* send each requested chunk */
+		for (	i = 0,	zend_hash_internal_pointer_reset(Z_ARRVAL_P(zranges));
+				i < c;
+				i++,	zend_hash_move_forward(Z_ARRVAL_P(zranges))) {
+			if (	HASH_KEY_NON_EXISTANT == zend_hash_get_current_data(
+						Z_ARRVAL_P(zranges), (void **) &zrange) ||
+					SUCCESS != zend_hash_index_find(
+						Z_ARRVAL_PP(zrange), 0, (void **) &begin) ||
+					SUCCESS != zend_hash_index_find(
+						Z_ARRVAL_PP(zrange), 1, (void **) &end)) {
+				break;
+			}	
+
+			snprintf(preface, 1023,
+				HTTP_CRLF "%s" 
+				HTTP_CRLF "Content-Type: %s"
+				HTTP_CRLF "Content-Range: bytes %ld-%ld/%ld"
+				HTTP_CRLF 
+				HTTP_CRLF,
+				
+				bound, 
+				HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream", 
+				**begin, 
+				**end, 
+				size
+			);
+			
+			php_body_write(preface, strlen(preface) TSRMLS_CC);
+			http_send_chunk(data, **begin, **end + 1, mode);
 		}
 
-		snprintf(preface, 1024,
-			"\r\n%s\r\nContent-Type: %s\r\nContent-Range: bytes %d-%d/%d\r\n\r\n", bound,
-			HTTP_G(ctype) ? HTTP_G(ctype) : "application/x-octetstream",
-			**begin, **end, size);
-		php_body_write(preface, strlen(preface) TSRMLS_CC);
-		http_send_chunk(data, **begin, **end + 1, mode);
+		/* write boundary once more */
+		php_body_write(HTTP_CRLF, 2 TSRMLS_CC);
+		php_body_write(bound, strlen(bound) TSRMLS_CC);
 
+		return SUCCESS;
 	}
-
-	/* free zranges */
-	zval_dtor(zranges);
-	efree(zranges);
-
-	/* write boundary once more */
-	php_body_write("\n", 1 TSRMLS_CC);
-	php_body_write(bound, strlen(bound) TSRMLS_CC);
-
-	return SUCCESS;
 }
 /* }}} */
 
@@ -1467,16 +1495,19 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz
 PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 	const http_send_mode data_mode TSRMLS_DC)
 {
-	zval *zranges = NULL;
+	char *new_etag = NULL;
+	int is_range_request = http_is_range_request();
 
 	if (!data_ptr) {
 		return FAILURE;
 	}
 
-	/* never ever use the output to compute the ETag if http_send() is used */
+	/* etag handling */
 	if (HTTP_G(etag_started)) {
-		char *new_etag = (char *) emalloc(33);
+		new_etag = (char *) emalloc(33);
 
+		/* never ever use the output to compute the ETag if http_send() is used */
+		HTTP_G(etag_started) = 0;
 		php_end_ob_buffer(0, 0 TSRMLS_CC);
 		if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) {
 			efree(new_etag);
@@ -1484,7 +1515,7 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 		}
 
 		/* send 304 Not Modified if etag matches */
-		if (http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
+		if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
 			efree(new_etag);
 			return http_send_status(304);
 		}
@@ -1493,33 +1524,53 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 		efree(new_etag);
 	}
 
-	if (http_is_range_request()) {
+	/* send 304 Not Modified if last-modified matches*/
+    if ((!is_range_request) && http_modified_match("HTTP_IF_MODIFIED_SINCE", HTTP_G(lmod))) {
+        return http_send_status(304);
+    }
 
-		MAKE_STD_ZVAL(zranges);
-		array_init(zranges);
+	if (is_range_request) {
 
-		switch (http_get_request_ranges(zranges, data_size))
-		{
-			case RANGE_NO:
-				zval_dtor(zranges);
-				efree(zranges);
-				/* go ahead and send all */
-			break;
+		/* only send ranges if entity hasn't changed */
+		if (
+			((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_MATCH", 13)) ||
+			http_etag_match("HTTP_IF_MATCH", HTTP_G(etag)))
+			&&
+			((!zend_hash_exists(HTTP_SERVER_VARS, "HTTP_IF_UNMODIFIED_SINCE", 25)) ||
+			http_modified_match("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(lmod)))
+		) {
 
-			case RANGE_OK:
-				return http_send_ranges(zranges, data_ptr, data_size, data_mode);
-			break;
+			STATUS result = FAILURE;
+			zval *zranges = NULL;
+			MAKE_STD_ZVAL(zranges);
+			array_init(zranges);
 
-			case RANGE_ERR:
-				zval_dtor(zranges);
-				efree(zranges);
-				http_send_status(416);
-				return FAILURE;
-			break;
+			switch (http_get_request_ranges(zranges, data_size))
+			{
+				case RANGE_NO:
+					zval_dtor(zranges);
+					efree(zranges);
+					/* go ahead and send all */
+				break;
 
-			default:
-				return FAILURE;
-			break;
+				case RANGE_OK:
+					result = http_send_ranges(zranges, data_ptr, data_size, data_mode);
+					zval_dtor(zranges);
+					efree(zranges);
+					return result;
+				break;
+
+				case RANGE_ERR:
+					zval_dtor(zranges);
+					efree(zranges);
+					http_send_status(416);
+					return FAILURE;
+				break;
+
+				default:
+					return FAILURE;
+				break;
+			}
 		}
 	}
 	/* send all */
@@ -1537,7 +1588,7 @@ PHP_HTTP_API STATUS _http_send_data(const zval *zdata TSRMLS_DC)
 		return FAILURE;
 	}
 
-	return http_send((void *) zdata, Z_STRLEN_P(zdata), SEND_DATA);
+	return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA);
 }
 /* }}} */
 
@@ -1548,7 +1599,7 @@ PHP_HTTP_API STATUS _http_send_stream(const php_stream *file TSRMLS_DC)
 		return FAILURE;
 	}
 
-	return http_send((void *) file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
+	return http_send(file, HTTP_G(ssb).sb.st_size, SEND_RSRC);
 }
 /* }}} */
 
@@ -1581,7 +1632,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 	char *d_ptr;
 
 	*decoded_len = 0;
-	*decoded = (char *) ecalloc(1, encoded_len);
+	*decoded = (char *) ecalloc(encoded_len, 1);
 	d_ptr = *decoded;
 	e_ptr = encoded;
 
@@ -1601,8 +1652,22 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 			hex_len[i++] = *e_ptr++;
 		}
 
+		/* reached the end */
+		if (!strcmp(hex_len, "0")) {
+			break;
+		}
+
+		/* new line */
+		if (strncmp(e_ptr, HTTP_CRLF, 2)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING,
+				"Invalid character (expected 0x0D 0x0A; got: %x %x)",
+				*e_ptr, *(e_ptr + 1));
+			efree(*decoded);
+			return FAILURE;
+		}
+
 		/* hex to long */
-		if (strcmp(hex_len, "0")) {
+		{
 			char *error = NULL;
 			chunk_len = strtol(hex_len, &error, 16);
 			if (error == hex_len) {
@@ -1611,20 +1676,9 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 				efree(*decoded);
 				return FAILURE;
 			}
-		} else {
-			break;
-		}
-
-		/* new line */
-		if (*e_ptr++ != '\r' || *e_ptr++ != '\n') {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING,
-				"Invalid character (expected 0x0A, 0x0D; got: %x)",
-				*(e_ptr - 1));
-			efree(*decoded);
-			return FAILURE;
 		}
 
-		memcpy(d_ptr, e_ptr, chunk_len);
+		memcpy(d_ptr, e_ptr += 2, chunk_len);
 		d_ptr += chunk_len;
 		e_ptr += chunk_len + 2;
 		*decoded_len += chunk_len;
@@ -1634,8 +1688,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;
@@ -1658,47 +1712,58 @@ 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_headers(header, body - Z_STRVAL_P(zresponse), zheaders);
+}
+/* }}} */
+
+/* {{{ STATUS http_parse_headers(char *, long, zval *) */
+PHP_HTTP_API STATUS _http_parse_headers(char *header, int 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, HTTP_CRLF);
+		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;
-			}
+	while (header_len > (line - begin)) {
+		switch (*line++)
+		{
+			case 0:
+			case '\n':
+				if (colon && (*line != ' ') && (*line != '\t')) {
+					char *key = estrndup(header, colon - header);
+					add_assoc_stringl(array, key, colon + 2, line - colon - 4, 1);
+					efree(key);
+
+					colon = NULL;
+					header += line - header;
+				}
+			break;
+
+			case ':':
+				if (!colon) {
+					colon = line - 1;
+				}
+			break;
 		}
 	}
+	return SUCCESS;
 }
 /* }}} */
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && HAVE_CURL
+#ifdef HTTP_HAVE_CURL
 
 /* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */
 PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,