let the ctor honor the options array too

[m6w6/ext-http] / php_http_misc.c

diff --git a/php_http_misc.c b/php_http_misc.c
index 2860caa39a0704e65ca5093d3772bbaeee2dc21d..c4661b7befc2988875ba6cacfbbbaf96cff83c96 100644 (file)
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -50,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);
@@ -112,6 +116,30 @@ 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 */
 
 int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
@@ -184,6 +212,22 @@ PHP_HTTP_API size_t php_http_pass_wrapper(php_http_pass_callback_arg_t *cb, cons
        return cb->cb_zts(cb->cb_arg, str, len TSRMLS_CC);
 }
 
+PHP_HTTP_API 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;
+       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 */
 
 static inline int scope_error_handling(long type TSRMLS_DC)