X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_misc.c;h=8e2227da1db0ec1a17135123ff09f7e657d719d0;hp=092662a346583b9f62ae32447a193320136e8289;hb=refs%2Fheads%2Fv2.3.x;hpb=c1f2ac7da167dec92df81ad33de65b953ccd043d

diff --git a/php_http_misc.c b/php_http_misc.c
index 092662a..8e2227d 100644
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2014, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -17,7 +17,7 @@
 
 /* SLEEP */
 
-PHP_HTTP_API void php_http_sleep(double s)
+void php_http_sleep(double s)
 {
 #if defined(PHP_WIN32)
 	Sleep((DWORD) PHP_HTTP_MSEC(s));
@@ -61,7 +61,8 @@ int php_http_match(const char *haystack_str, const char *needle_str, int flags)
 			result = !strcasecmp(haystack_str, needle_str);
 		}
 	} else {
-		char *found, *haystack = estrdup(haystack_str), *needle = estrdup(needle_str);
+		const char *found;
+		char *haystack = estrdup(haystack_str), *needle = estrdup(needle_str);
 
 		if (flags & PHP_HTTP_MATCH_CASE) {
 			found = zend_memnstr(haystack, needle, strlen(needle), haystack+strlen(haystack));
@@ -79,23 +80,23 @@ int php_http_match(const char *haystack_str, const char *needle_str, int flags)
 			}
 		}
 
-		STR_FREE(haystack);
-		STR_FREE(needle);
+		PTR_FREE(haystack);
+		PTR_FREE(needle);
 	}
 
 	return result;
 }
 
-char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
+char *php_http_pretty_key(register char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
 {
-	size_t i;
+	size_t i = 1;
 	int wasalpha;
 
 	if (key && key_len) {
 		if ((wasalpha = PHP_HTTP_IS_CTYPE(alpha, key[0]))) {
 			key[0] = (char) (uctitle ? PHP_HTTP_TO_CTYPE(upper, key[0]) : PHP_HTTP_TO_CTYPE(lower, key[0]));
 		}
-		for (i = 1; i < key_len; i++) {
+		PHP_HTTP_DUFF(key_len,
 			if (PHP_HTTP_IS_CTYPE(alpha, key[i])) {
 				key[i] = (char) (((!wasalpha) && uctitle) ? PHP_HTTP_TO_CTYPE(upper, key[i]) : PHP_HTTP_TO_CTYPE(lower, key[i]));
 				wasalpha = 1;
@@ -105,7 +106,8 @@ char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_boo
 				}
 				wasalpha = 0;
 			}
-		}
+			++i;
+		);
 	}
 	return key;
 }
@@ -113,7 +115,7 @@ char *php_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_boo
 
 size_t php_http_boundary(char *buf, size_t buf_len TSRMLS_DC)
 {
-	return snprintf(buf, buf_len, "%15.15F", PHP_HTTP_G->env.request.time * php_combined_lcg(TSRMLS_C));
+	return snprintf(buf, buf_len, "%15.15F", sapi_get_request_time(TSRMLS_C) * php_combined_lcg(TSRMLS_C));
 }
 
 int php_http_select_str(const char *cmp, int argc, ...)
@@ -142,7 +144,7 @@ int php_http_select_str(const char *cmp, int argc, ...)
 
 /* ARRAYS */
 
-PHP_HTTP_API unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...)
+unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...)
 {
 	HashPosition pos;
 	unsigned argl = 0;
@@ -165,12 +167,19 @@ PHP_HTTP_API unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc
 	return argl;
 }
 
+void php_http_array_copy_strings(void *zpp)
+{
+	zval **zvpp = ((zval **) zpp);
+
+	*zvpp = php_http_zsep(1, IS_STRING, *zvpp);
+}
+
 int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
 	int flags;
 	char *key = NULL;
 	HashTable *dst;
-	zval **data = NULL, **value = (zval **) pDest;
+	zval **data = NULL, *value = *((zval **) pDest);
 
 	dst = va_arg(args, HashTable *);
 	flags = va_arg(args, int);
@@ -179,20 +188,29 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis
 		if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) {
 			key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1);
 			zend_hash_find(dst, key, hash_key->nKeyLength, (void *) &data);
-		} else {
+		} else if (hash_key->nKeyLength) {
 			zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data);
+		} else {
+			zend_hash_index_find(dst, hash_key->h, (void *) &data);
+		}
+
+		if (flags & ARRAY_JOIN_STRINGIFY) {
+			value = php_http_zsep(1, IS_STRING, value);
+		} else {
+			Z_ADDREF_P(value);
 		}
 
-		Z_ADDREF_P(*value);
 		if (data) {
 			if (Z_TYPE_PP(data) != IS_ARRAY) {
 				convert_to_array(*data);
 			}
-			add_next_index_zval(*data, *value);
+			add_next_index_zval(*data, value);
 		} else if (key) {
-			zend_symtable_update(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
+			zend_symtable_update(dst, key, hash_key->nKeyLength, &value, sizeof(zval *), NULL);
+		} else if (hash_key->nKeyLength) {
+			zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &value, sizeof(zval *), NULL);
 		} else {
-			zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, value, sizeof(zval *), NULL);
+			zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL);
 		}
 
 		if (key) {
@@ -208,19 +226,26 @@ int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list
 	int flags;
 	char *key = NULL;
 	HashTable *dst;
-	zval **value = (zval **) pDest;
+	zval *value = *((zval **) pDest);
 
 	dst = va_arg(args, HashTable *);
 	flags = va_arg(args, int);
 
 	if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) {
-		Z_ADDREF_P(*value);
+		if (flags & ARRAY_JOIN_STRINGIFY) {
+			value = php_http_zsep(1, IS_STRING, value);
+		} else {
+			Z_ADDREF_P(value);
+		}
+
 		if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) {
 			key = php_http_pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1);
-			zend_hash_update(dst, key, hash_key->nKeyLength, (void *) value, sizeof(zval *), NULL);
+			zend_hash_update(dst, key, hash_key->nKeyLength, (void *) &value, sizeof(zval *), NULL);
 			efree(key);
+		} else if (hash_key->nKeyLength) {
+			zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &value, sizeof(zval *), NULL);
 		} else {
-			zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) value, sizeof(zval *), NULL);
+			zend_hash_index_update(dst, hash_key->h, (void *) &value, sizeof(zval *), NULL);
 		}
 	}
 
@@ -229,7 +254,7 @@ int php_http_array_apply_merge_func(void *pDest TSRMLS_DC, int num_args, va_list
 
 /* PASS CALLBACK */
 
-PHP_HTTP_API size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len)
+size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len)
 {
 	php_http_pass_fcall_arg_t *fcd = cb_arg;
 	zval *zdata;
@@ -245,78 +270,9 @@ PHP_HTTP_API size_t php_http_pass_fcall_callback(void *cb_arg, const char *str,
 	return len;
 }
 
-/* ERROR */
-
-static inline int scope_error_handling(long type TSRMLS_DC)
-{
-	if ((type == E_THROW) || (EG(error_handling) == EH_THROW)) {
-		return EH_THROW;
-	}
-
-	if (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), php_http_object_get_class_entry() TSRMLS_CC)) {
-		return php_http_object_get_error_handling(EG(This) TSRMLS_CC);
-	}
-
-	return EH_NORMAL;
-}
-
-void php_http_error(long type TSRMLS_DC, long code, const char *format, ...)
-{
-	va_list args;
-
-	va_start(args, format);
-	switch (scope_error_handling(type TSRMLS_CC)) {
-		case EH_THROW: {
-			char *message;
-			zend_class_entry *ce = php_http_exception_get_class_entry();
-
-			/*  FIXME wat? */
-			if (0&& EG(exception_class) && instanceof_function(EG(exception_class), ce TSRMLS_CC)) {
-				ce = EG(exception_class);
-			}
-
-			vspprintf(&message, 0, format, args);
-			zend_throw_exception(ce, message, code TSRMLS_CC);
-			efree(message);
-			break;
-		}
-		case EH_NORMAL:
-			php_verror(NULL, "", type, format, args TSRMLS_CC);
-			break;
-		case EH_SUPPRESS:
-			break;
-	}
-	va_end(args);
-}
 
 /* ZEND */
 
-STATUS php_http_method_call(zval *object, const char *method_str, size_t method_len, int argc, zval **argv[], zval **retval_ptr TSRMLS_DC)
-{
-	zend_fcall_info fci;
-	zval zmethod;
-	zval *retval;
-	STATUS rv;
-
-	fci.size = sizeof(fci);
-	fci.object_ptr = object;
-	fci.function_name = &zmethod;
-	fci.retval_ptr_ptr = retval_ptr ? retval_ptr : &retval;
-	fci.param_count = argc;
-	fci.params = argv;
-	fci.no_separation = 1;
-	fci.symbol_table = NULL;
-	fci.function_table = NULL;
-
-	INIT_PZVAL(&zmethod);
-	ZVAL_STRINGL(&zmethod, method_str, method_len, 0);
-	rv = zend_call_function(&fci, NULL TSRMLS_CC);
-
-	if (!retval_ptr && retval) {
-		zval_ptr_dtor(&retval);
-	}
-	return rv;
-}
 /*
  * Local variables:
  * tab-width: 4