X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=04247fa310d771ac16a9fc99e810671ff1f7db56;hp=61de3e81f1448d352c367d8596a145b1f597215e;hb=b37be57f73de02b4bfe632223af12098b9dc7e6f;hpb=6c4a552c1ad7b0018afb57a3d0028c2be166a30a

diff --git a/http_api.c b/http_api.c
index 61de3e8..04247fa 100644
--- a/http_api.c
+++ b/http_api.c
@@ -17,6 +17,7 @@
 
 #include "php_output.h"
 #include "ext/standard/url.h"
+#include "ext/standard/php_lcg.h"
 
 #include "php_http_api.h"
 #include "php_http_send_api.h"
@@ -94,6 +95,13 @@ char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool x
 }
 /* }}} */
 
+/* {{{ http_boundary(char *, size_t) */
+size_t _http_boundary(char *buf, size_t buf_len TSRMLS_DC)
+{
+	return snprintf(buf, buf_len, "%lu%0.9f", (ulong) HTTP_G->request.time, (float) php_combined_lcg(TSRMLS_C));
+}
+/* }}} */
+
 /* {{{ void http_error(long, long, char*) */
 void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 {
@@ -101,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);
 		
@@ -109,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);
@@ -184,7 +192,7 @@ STATUS _http_object_new(zend_object_value *ov, const char *cname_str, uint cname
 	zend_class_entry *ce = parent_ce;
 	
 	if (cname_str && cname_len) {
-		if (!(ce = zend_fetch_class((char *) cname_str, cname_len, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC))) {
+		if (!(ce = zend_fetch_class(HTTP_ZAPI_CONST_CAST(char *) cname_str, cname_len, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC))) {
 			return FAILURE;
 		}
 		if (!instanceof_function(ce, parent_ce TSRMLS_CC)) {
@@ -314,7 +322,7 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_len, zend
 	if ((SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) {
 		return NULL;
 	}
-	if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_len + 1, (void *) &var))) {
+	if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), HTTP_ZAPI_CONST_CAST(char *) key, key_len + 1, (void *) &var))) {
 		return NULL;
 	}
 	if (check && !((Z_TYPE_PP(var) == IS_STRING) && Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
@@ -349,6 +357,9 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 			memcpy(*body + *length, buf, len);
 			*length += len;
 			(*body)[*length] = '\0';
+			if (len < (int) sizeof(buf)) {
+				break;
+			}
 		}
 		
 		/* check for error */
@@ -387,6 +398,9 @@ PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
 			
 			while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
 				php_stream_write(s, buf, len);
+				if (len < (int) sizeof(buf)) {
+					break;
+				}
 			}
 			
 			if (len < 0) {
@@ -541,15 +555,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;
@@ -566,7 +571,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;
 						}
@@ -638,7 +668,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;
@@ -658,10 +688,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 {
@@ -676,7 +703,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;