X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=b099b5aca729397a7358155d84896e870ef836a8;hp=2bc553e2763c4d1211942e86f470fbfff5d0df34;hb=6564b507fceb20fd8065d839cf8ec0091a7c4627;hpb=e0b95d0689396baab08049b7de5063ff86a7b62a

diff --git a/http_api.c b/http_api.c
index 2bc553e..b099b5a 100644
--- a/http_api.c
+++ b/http_api.c
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#define _WINSOCKAPI_
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
@@ -146,6 +147,8 @@ static int check_tzone(char *tzone);
 
 static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen);
 
+static int http_ob_stack_get(php_ob_buffer *, php_ob_buffer **);
+
 /* {{{ HAVE_CURL */
 #ifdef HTTP_HAVE_CURL
 #define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
@@ -202,7 +205,8 @@ static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 static inline char *_http_etag(char **new_etag, const void *data_ptr,
 	const size_t data_len, const http_send_mode data_mode TSRMLS_DC)
 {
-	char ssb_buf[127], digest[16];
+	char ssb_buf[127];
+	unsigned char digest[16];
 	PHP_MD5_CTX ctx;
 
 	PHP_MD5Init(&ctx);
@@ -289,8 +293,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 		break;
 
 		case SEND_DATA:
-			return len == php_body_write(
-				Z_STRVAL_P((zval *) data) + begin, len TSRMLS_CC)
+			return len == php_body_write(((char *)data) + begin, len TSRMLS_CC)
 				? SUCCESS : FAILURE;
 		break;
 
@@ -834,6 +837,20 @@ static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
 }
 /* }}} */
 
+/* {{{ static STATUS http_ob_stack_get(php_ob_buffer *, php_ob_buffer **) */
+static STATUS http_ob_stack_get(php_ob_buffer *o, php_ob_buffer **s)
+{
+	static int i = 0;
+	php_ob_buffer *b = emalloc(sizeof(php_ob_buffer));
+	b->handler_name = estrdup(o->handler_name);
+	b->buffer = estrndup(o->buffer, o->text_length);
+	b->chunk_size = o->chunk_size;
+	b->erase = o->erase;
+	s[i++] = b;
+	return SUCCESS;
+}
+/* }}} */
+
 /* }}} internals */
 
 /* {{{ public API */
@@ -842,10 +859,10 @@ static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
 PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC)
 {
 	struct tm *gmtime, tmbuf;
-	char *date = ecalloc(1, 30);
+	char *date = ecalloc(31, 1);
 
 	gmtime = php_gmtime_r(&t, &tmbuf);
-	snprintf(date, 29,
+	snprintf(date, 30,
 		"%s, %02d %s %04d %02d:%02d:%02d GMT",
 		days[gmtime->tm_wday], gmtime->tm_mday,
 		months[gmtime->tm_mon], gmtime->tm_year + 1900,
@@ -1094,6 +1111,42 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
 }
 /* }}} */
 
+/* {{{ STATUS http_start_ob_handler(php_output_handler_func_t, char *, uint, zend_bool) */
+PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_func,
+	char *handler_name, uint chunk_size, zend_bool erase TSRMLS_DC)
+{
+	php_ob_buffer **stack;
+	int count, i;
+
+	if (count = OG(ob_nesting_level)) {
+		stack = ecalloc(sizeof(php_ob_buffer), count);
+
+		if (count > 1) {
+			zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP,
+				(int (*)(void *elem, void *)) http_ob_stack_get, stack);
+		}
+
+		if (count > 0) {
+			http_ob_stack_get(&OG(active_ob_buffer), stack);
+		}
+
+		while (OG(ob_nesting_level)) {
+			php_end_ob_buffer(0, 0 TSRMLS_CC);
+		}
+	}
+	
+	php_ob_set_internal_handler(handler_func, chunk_size, handler_name, erase TSRMLS_CC);
+
+	for (i = 0; i < count; i++) {
+		php_ob_buffer *s = stack[i];
+		php_start_ob_buffer_named(s->handler_name, s->chunk_size, s->erase TSRMLS_CC);
+		php_body_write(s->buffer, s->text_length TSRMLS_CC);
+	}
+
+	return SUCCESS;
+}
+/* }}} */
+
 /* {{{ int http_modified_match(char *, int) */
 PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_DC)
 {
@@ -1162,12 +1215,17 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag,
 	int header_len;
 	char *etag_header;
 
-	header_len = strlen("ETag: \"\"") + etag_len + 1;
-	etag_header = (char *) emalloc(header_len);
-	snprintf(etag_header, header_len - 1, "ETag: \"%s\"", etag);
+	header_len = sizeof("ETag: \"\"") + etag_len + 1;
+	etag_header = ecalloc(header_len, 1);
+	sprintf(etag_header, "ETag: \"%s\"", etag);
 	ret = http_send_header(etag_header);
 	efree(etag_header);
 
+	if (!etag_len){
+		php_error_docref(NULL TSRMLS_CC,E_ERROR,
+			"Sending empty Etag (previous: %s)\n", HTTP_G(etag));
+		return FAILURE;
+	}
 	/* remember */
 	if (HTTP_G(etag)) {
 		efree(HTTP_G(etag));
@@ -1519,7 +1577,6 @@ 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)
 {
-	char *new_etag = NULL;
 	int is_range_request = http_is_range_request();
 
 	if (!data_ptr) {
@@ -1528,24 +1585,24 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 
 	/* etag handling */
 	if (HTTP_G(etag_started)) {
-		new_etag = (char *) emalloc(33);
-
-		/* never ever use the output to compute the ETag if http_send() is used */
+		char *etag = ecalloc(33, 1);
+		/* interrupt */
 		HTTP_G(etag_started) = 0;
+		/* never ever use the output to compute the ETag if http_send() is used */
 		php_end_ob_buffer(0, 0 TSRMLS_CC);
-		if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) {
-			efree(new_etag);
+		if (NULL == http_etag(&etag, data_ptr, data_size, data_mode)) {
+			efree(etag);
 			return FAILURE;
 		}
 
 		/* send 304 Not Modified if etag matches */
-		if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
-			efree(new_etag);
+		if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+			efree(etag);
 			return http_send_status(304);
 		}
 
-		http_send_etag(new_etag, 32);
-		efree(new_etag);
+		http_send_etag(etag, 32);
+		efree(etag);
 	}
 
 	/* send 304 Not Modified if last-modified matches*/
@@ -1612,7 +1669,7 @@ PHP_HTTP_API STATUS _http_send_data(const zval *zdata TSRMLS_DC)
 		return FAILURE;
 	}
 
-	return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA);
+	return http_send(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), SEND_DATA);
 }
 /* }}} */
 
@@ -1745,7 +1802,7 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
 {
 	char *colon = NULL, *line = NULL, *begin = header;
 
-	if (header_len < 8) {
+	if (header_len < 2) {
 		return FAILURE;
 	}
 
@@ -1782,7 +1839,7 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
 
 						if (value_len < 1) {
 							/* hm, empty header? */
-							add_assoc_stringl(array, key, "", 0, 0);
+							add_assoc_stringl(array, key, "", 0, 1);
 						} else {
 							add_assoc_stringl(array, key, colon, value_len, 1);
 						}