X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=aebd434209deb323f2c2ba3dac0b73649f276222;hp=77b11348c0a0bfc484d3120de9dcb2b1a08ab12b;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=78145de6c3c0a6b7543c5b3e4d45a321c6defe75

diff --git a/http_api.c b/http_api.c
index 77b1134..aebd434 100644
--- a/http_api.c
+++ b/http_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -180,7 +180,10 @@ zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend_class_
 		copy_bt_args(old_exception, new_exception TSRMLS_CC);
 		copy_bt_args(old_exception, sub_exception TSRMLS_CC);
 	}
-	
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
+	Z_ADDREF_P(old_exception);
+	zend_exception_set_previous(new_exception, old_exception TSRMLS_CC);
+#endif
 	zval_ptr_dtor(&old_exception);
 	return new_exception;
 }
@@ -250,9 +253,15 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		return FAILURE;
 	}
 	
+#if PHP_VERSION_ID < 50399
 	if (!OG(ob_lock)) {
 		php_end_ob_buffers(0 TSRMLS_CC);
 	}
+#else
+	if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_LOCKED) {
+		php_output_end_all(TSRMLS_C);
+	}
+#endif
 	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
 		PHPWRITE(body, strlen(body));
 	}
@@ -347,17 +356,21 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 		}
 		return SUCCESS;
 	} else if (sapi_module.read_post && !HTTP_G->read_post_data) {
-		char buf[4096];
+		char *buf = emalloc(4096);
 		int len;
 		
 		HTTP_G->read_post_data = 1;
 		
-		while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+		while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
 			*body = erealloc(*body, *length + len + 1);
 			memcpy(*body + *length, buf, len);
 			*length += len;
 			(*body)[*length] = '\0';
+			if (len < (int) sizeof(buf)) {
+				break;
+			}
 		}
+		efree(buf);
 		
 		/* check for error */
 		if (len < 0) {
@@ -390,12 +403,16 @@ PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
 		HTTP_G->read_post_data = 1;
 		
 		if ((s = php_stream_temp_new())) {
-			char buf[4096];
+			char *buf = emalloc(4096);
 			int len;
 			
-			while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+			while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
 				php_stream_write(s, buf, len);
+				if (len < (int) sizeof(buf)) {
+					break;
+				}
 			}
+			efree(buf);
 			
 			if (len < 0) {
 				php_stream_close(s);
@@ -549,15 +566,6 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int flags, http_par
 						goto failure;
 						break;
 					
-					case '=':
-						if (key) {
-							keylen = c - key;
-							st = ST_VALUE;
-						} else {
-							goto failure;
-						}
-						break;
-					
 					case ' ':
 						if (key) {
 							keylen = c - key;
@@ -574,7 +582,32 @@ PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int flags, http_par
 						}
 						break;
 					
+					case ':':
+						if (!(flags & HTTP_PARAMS_COLON_SEPARATOR)) {
+							goto not_separator;
+						}
+						if (key) {
+							keylen = c - key;
+							st = ST_VALUE;
+						} else {
+							goto failure;
+						}
+						break;
+						
+					case '=':
+						if (flags & HTTP_PARAMS_COLON_SEPARATOR) {
+							goto not_separator;
+						}
+						if (key) {
+							keylen = c - key;
+							st = ST_VALUE;
+						} else {
+							goto failure;
+						}
+						break;
+					
 					default:
+					not_separator:
 						if (!key) {
 							key = c;
 						}
@@ -646,7 +679,7 @@ failure:
 /* }}} */
 
 /* {{{ array_join */
-int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+int apply_array_append_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
 	int flags;
 	char *key = NULL;
@@ -666,10 +699,7 @@ int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_k
 		
 		ZVAL_ADDREF(*value);
 		if (data) {
-			if (Z_TYPE_PP(data) != IS_ARRAY) {
-				convert_to_array(*data);
-			}
-			add_next_index_zval(*data, *value);
+			add_next_index_zval(http_zset(IS_ARRAY, *data), *value);
 		} else if (key) {
 			zend_hash_add(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
 		} else {
@@ -684,7 +714,7 @@ int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_k
 	return ZEND_HASH_APPLY_KEEP;
 }
 
-int apply_array_merge_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+int apply_array_merge_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
 	int flags;
 	char *key = NULL;