X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_api.c;h=4fa8c3d5b703203f92b84c083e421500bc7f8a9b;hb=f12e0c5ab62139e372a4ca509637dc458e7c9cb4;hp=4ab7d7edbd1862d4eb6b2ab41ef7eb0666907717;hpb=378dd0f912b3139f1a797cf19e7c4eb88d33f141;p=m6w6%2Fext-http

diff --git a/http_api.c b/http_api.c
index 4ab7d7e..4fa8c3d 100644
--- a/http_api.c
+++ b/http_api.c
@@ -109,7 +109,7 @@ void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 	
 	va_start(args, format);
 #ifdef ZEND_ENGINE_2
-	if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
+	if ((type == E_THROW) || (GLOBAL_ERROR_HANDLING == EH_THROW)) {
 		char *message;
 		zend_class_entry *ce = http_exception_get_for_code(code);
 		
@@ -117,7 +117,7 @@ void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 			vspprintf(&message, 0, format, args);
 			zend_throw_exception(ce, message, code TSRMLS_CC);
 			efree(message);
-		} http_catch(PG(exception_class) ? PG(exception_class) : HTTP_EX_DEF_CE);
+		} http_catch(GLOBAL_EXCEPTION_CLASS ? GLOBAL_EXCEPTION_CLASS : HTTP_EX_DEF_CE);
 	} else
 #endif
 	php_verror(NULL, "", type, format, args TSRMLS_CC);
@@ -549,15 +549,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 +565,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 +662,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 +682,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 +697,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;