X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_misc.c;h=f14354abfab28291799129062f97f8a46553d108;hp=db588ea6be2697b50971db70f94284c00ad7273d;hb=7b028d0cbb030f9610084314f67b77907d8474a2;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405

diff --git a/php_http_misc.c b/php_http_misc.c
index db588ea..f14354a 100644
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -10,11 +10,10 @@
     +--------------------------------------------------------------------+
 */
 
-#include "php_http.h"
+#include "php_http_api.h"
 
 #include <ext/standard/php_lcg.h>
-#include <ext/standard/php_string.h>
-#include <Zend/zend_exceptions.h>
+#include <zend_exceptions.h>
 
 /* SLEEP */
 
@@ -37,7 +36,7 @@ PHP_HTTP_API void php_http_sleep(double s)
 #else
 	struct timeval timeout;
 
-	timeout.tv.sec = (time_t) s;
+	timeout.tv_sec = (time_t) s;
 	timeout.tv_usec = PHP_HTTP_USEC(s) % PHP_HTTP_MCROSEC;
 
 	select(0, NULL, NULL, NULL, &timeout);
@@ -51,6 +50,10 @@ int php_http_match(const char *haystack_str, const char *needle_str, int flags)
 {
 	int result = 0;
 
+	if (!haystack_str || !needle_str) {
+		return result;
+	}
+
 	if (flags & PHP_HTTP_MATCH_FULL) {
 		if (flags & PHP_HTTP_MATCH_CASE) {
 			result = !strcmp(haystack_str, needle_str);
@@ -113,8 +116,55 @@ 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));
 }
 
+int php_http_select_str(const char *cmp, int argc, ...)
+{
+	va_list argv;
+	int match = -1;
+
+	if (cmp && argc > 0) {
+		int i;
+
+		va_start(argv, argc);
+		for (i = 0; i < argc; ++i) {
+			const char *test = va_arg(argv, const char *);
+
+			if (!strcasecmp(cmp, test)) {
+				match = i;
+				break;
+			}
+		}
+		va_end(argv);
+	}
+
+	return match;
+}
+
+
 /* ARRAYS */
 
+PHP_HTTP_API unsigned php_http_array_list(HashTable *ht TSRMLS_DC, unsigned argc, ...)
+{
+	HashPosition pos;
+	unsigned argl = 0;
+	va_list argv;
+
+	va_start(argv, argc);
+	for (	zend_hash_internal_pointer_reset_ex(ht, &pos);
+			SUCCESS == zend_hash_has_more_elements_ex(ht, &pos) && (argl < argc);
+			zend_hash_move_forward_ex(ht, &pos))
+	{
+		zval **data, ***argp = (zval ***) va_arg(argv, zval ***);
+
+		if (SUCCESS == zend_hash_get_current_data_ex(ht, (void *) &data, &pos)) {
+			*argp = data;
+			++argl;
+		}
+	}
+	va_end(argv);
+
+	return argl;
+}
+
 int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
 {
 	int flags;
@@ -179,10 +229,20 @@ 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_wrapper(php_http_pass_callback_arg_t *cb, const char *str, size_t len)
+PHP_HTTP_API size_t php_http_pass_fcall_callback(void *cb_arg, const char *str, size_t len)
 {
-	TSRMLS_FETCH();
-	return cb->cb_zts(cb->cb_arg, str, len TSRMLS_CC);
+	php_http_pass_fcall_arg_t *fcd = cb_arg;
+	zval *zdata;
+	TSRMLS_FETCH_FROM_CTX(fcd->ts);
+
+	MAKE_STD_ZVAL(zdata);
+	ZVAL_STRINGL(zdata, str, len, 1);
+	if (SUCCESS == zend_fcall_info_argn(&fcd->fci TSRMLS_CC, 2, &fcd->fcz, &zdata)) {
+		zend_fcall_info_call(&fcd->fci, &fcd->fcc, NULL, NULL TSRMLS_CC);
+		zend_fcall_info_args_clear(&fcd->fci, 0);
+	}
+	zval_ptr_dtor(&zdata);
+	return len;
 }
 
 /* ERROR */
@@ -193,7 +253,7 @@ static inline int scope_error_handling(long type TSRMLS_DC)
 		return EH_THROW;
 	}
 
-	if (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), php_http_object_class_entry TSRMLS_CC)) {
+	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);
 	}
 
@@ -208,9 +268,10 @@ void php_http_error(long type TSRMLS_DC, long code, const char *format, ...)
 	switch (scope_error_handling(type TSRMLS_CC)) {
 		case EH_THROW: {
 			char *message;
-			zend_class_entry *ce = php_http_exception_class_entry;
+			zend_class_entry *ce = php_http_exception_get_class_entry();
 
-			if (0&& EG(exception_class) && instanceof_function(EG(exception_class), php_http_exception_class_entry TSRMLS_CC)) {
+			/*  FIXME wat? */
+			if (0&& EG(exception_class) && instanceof_function(EG(exception_class), ce TSRMLS_CC)) {
 				ce = EG(exception_class);
 			}