X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=4718e3d1b1fcdcbc4233e05526dc53768aaacb82;hp=7904c5d9271ac295671787dc1fcced2f1b939a52;hb=318bb3459a12dc26362978413cde00cde6616d89;hpb=8d7fee64c740137b693630ad82374c11d1aaa76a

diff --git a/http_api.c b/http_api.c
index 7904c5d..4718e3d 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;
 
@@ -593,7 +596,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
 			if (key_type == HASH_KEY_IS_STRING) {
 				zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0);
 				zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val);
-				snprintf(header, 1024, "%s: %s", header_key, Z_STRVAL_PP(header_val));
+				snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
 				headers = curl_slist_append(headers, header);
 				zend_hash_move_forward(Z_ARRVAL_P(zoption));
 			}
@@ -685,7 +688,7 @@ static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRML
 			{
 				double d;
 				if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) {
-					add_assoc_double(array, key, (double) d);
+					add_assoc_double(array, key, d);
 				}
 			}
 			break;
@@ -694,7 +697,7 @@ static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRML
 			{
 				long l;
 				if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) {
-					add_assoc_long(array, key, (long) l);
+					add_assoc_long(array, key, l);
 				}
 			}
 			break;
@@ -706,12 +709,10 @@ static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRML
 /* {{{ static inline http_curl_getinfo(CURL, HashTable *) */
 static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
 {
-	zval *array;
+	zval array;
+	Z_ARRVAL(array) = info;
 
-	MAKE_STD_ZVAL(array);
-	Z_ARRVAL_P(array) = info;
-
-#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , array)
+#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , &array)
 	/* CURLINFO_EFFECTIVE_URL			=	CURLINFO_STRING	+1, */
 	INFO(EFFECTIVE_URL);
 	/* CURLINFO_RESPONSE_CODE			=	CURLINFO_LONG	+2, */
@@ -761,7 +762,6 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
 	/* CURLINFO_PROXYAUTH_AVAIL			=	CURLINFO_LONG	+24, */
 	INFO(PROXYAUTH_AVAIL);
 #undef INFO
-	efree(array);
 }
 /* }}} */
 
@@ -837,6 +837,21 @@ 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->text_length = o->text_length;
+	b->chunk_size = o->chunk_size;
+	b->erase = o->erase;
+	s[i++] = b;
+	return SUCCESS;
+}
+/* }}} */
+
 /* }}} internals */
 
 /* {{{ public API */
@@ -845,7 +860,7 @@ 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, 30,
@@ -1097,6 +1112,44 @@ 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];
+		if (strcmp(s->handler_name, "default output handler")) {
+			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)
 {
@@ -1165,12 +1218,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, "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));
@@ -1327,7 +1385,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 
 	if (strncmp(range, "bytes=", strlen("bytes="))) {
 		php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes=");
-		return RANGE_ERR;
+		return RANGE_NO;
 	}
 
 	ptr = &begin;
@@ -1433,7 +1491,7 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
 			break;
 
 			default:
-				return RANGE_ERR;
+				return RANGE_NO;
 			break;
 		}
 	} while (c != 0);
@@ -1522,7 +1580,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) {
@@ -1531,24 +1588,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*/
@@ -1615,7 +1672,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);
 }
 /* }}} */
 
@@ -1748,7 +1805,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;
 	}
 
@@ -1765,33 +1822,33 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
 
 	while (header_len >= (line - begin)) {
 		int value_len = 0;
-		
+
 		switch (*line++)
 		{
 			case 0:
 				--value_len; /* we don't have CR so value length is one char less */
 			case '\n':
 				if (colon && ((!(*line - 1)) || ((*line != ' ') && (*line != '\t')))) {
-				
+
 					/* skip empty key */
 					if (header != colon) {
 						char *key = estrndup(header, colon - header);
 						value_len += line - colon - 1;
-							
+
 						/* skip leading ws */
 						while (isspace(*(++colon))) --value_len;
 						/* skip trailing ws */
 						while (isspace(colon[value_len - 1])) --value_len;
-						
+
 						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);
 						}
 						efree(key);
 					}
-					
+
 					colon = NULL;
 					value_len = 0;
 					header += line - header;
@@ -1813,7 +1870,7 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
 PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
 {
     char *key;
-    
+
     for (   zend_hash_internal_pointer_reset(HTTP_SERVER_VARS);
             zend_hash_get_current_key(HTTP_SERVER_VARS, &key, NULL, 0) != HASH_KEY_NON_EXISTANT;
             zend_hash_move_forward(HTTP_SERVER_VARS)) {
@@ -1833,18 +1890,30 @@ PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
 PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
 	HashTable *info, char **data, size_t *data_len TSRMLS_DC)
 {
+	STATUS rs;
 	CURL *ch = curl_easy_init();
 
 	if (!ch) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
 		return FAILURE;
 	}
+	
+	rs = http_get_ex(ch, URL, options, info, data, data_len);
+	curl_easy_cleanup(ch);
+	return rs;
+}
+/* }}} */
 
+/* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
+	HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+{
 	http_curl_initbuf(CURLBUF_EVRY);
 	http_curl_setopts(ch, URL, options);
+	curl_easy_setopt(ch, CURLOPT_NOBODY, 0);
+	curl_easy_setopt(ch, CURLOPT_POST, 0);
 
 	if (CURLE_OK != curl_easy_perform(ch)) {
-		curl_easy_cleanup(ch);
 		http_curl_freebuf(CURLBUF_EVRY);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
 		return FAILURE;
@@ -1852,31 +1921,38 @@ PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
 	if (info) {
 		http_curl_getinfo(ch, info);
 	}
-	curl_easy_cleanup(ch);
-
 	http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
 	return SUCCESS;
 }
-/* }}} */
 
 /* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */
 PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
 	HashTable *info, char **data, size_t *data_len TSRMLS_DC)
 {
+	STATUS rs;
 	CURL *ch = curl_easy_init();
 
 	if (!ch) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
 		return FAILURE;
 	}
+	
+	rs = http_head_ex(ch, URL, options, info, data, data_len);
+	curl_easy_cleanup(ch);
+	return rs;
+}
+/* }}} */
 
+/* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, char **data, size_t *) */
+PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,
+	HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+{
 	http_curl_initbuf(CURLBUF_HDRS);
 	http_curl_setopts(ch, URL, options);
 	curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
+	curl_easy_setopt(ch, CURLOPT_POST, 0);
 
 	if (CURLE_OK != curl_easy_perform(ch)) {
-		curl_easy_cleanup(ch);
 		http_curl_freebuf(CURLBUF_HDRS);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
 		return FAILURE;
@@ -1884,26 +1960,33 @@ PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
 	if (info) {
 		http_curl_getinfo(ch, info);
 	}
-	curl_easy_cleanup(ch);
-
 	http_curl_movebuf(CURLBUF_HDRS, data, data_len);
-
 	return SUCCESS;
 }
-/* }}} */
 
 /* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
 PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
 	size_t postdata_len, HashTable *options, HashTable *info, char **data,
 	size_t *data_len TSRMLS_DC)
 {
+	STATUS rs;
 	CURL *ch = curl_easy_init();
 
 	if (!ch) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
 		return FAILURE;
 	}
+	rs = http_post_data_ex(ch, URL, postdata, postdata_len, options, info, data, data_len);
+	curl_easy_cleanup(ch);
+	return rs;
+}
+/* }}} */
 
+/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata,
+	size_t postdata_len, HashTable *options, HashTable *info, char **data,
+	size_t *data_len TSRMLS_DC)
+{
 	http_curl_initbuf(CURLBUF_EVRY);
 	http_curl_setopts(ch, URL, options);
 	curl_easy_setopt(ch, CURLOPT_POST, 1);
@@ -1911,7 +1994,6 @@ PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
 	curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
 
 	if (CURLE_OK != curl_easy_perform(ch)) {
-		curl_easy_cleanup(ch);
 		http_curl_freebuf(CURLBUF_EVRY);
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
 		return FAILURE;
@@ -1919,10 +2001,7 @@ PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
 	if (info) {
 		http_curl_getinfo(ch, info);
 	}
-	curl_easy_cleanup(ch);
-
 	http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
 	return SUCCESS;
 }
 /* }}} */