X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_misc.c;h=fa4bbbf2854add35e959331ea20fc48065acc843;hb=737776929a44884a24c3e584162d771ada71f7e9;hp=377aa9af4a925790770924ea9749607ca3732f14;hpb=a07b79b1871054ca17e48b69445b4dc201f24662;p=m6w6%2Fext-http

diff --git a/php_http_misc.c b/php_http_misc.c
index 377aa9a..fa4bbbf 100644
--- a/php_http_misc.c
+++ b/php_http_misc.c
@@ -6,17 +6,14 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2011, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
-/* $Id $ */
-
-#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 */
 
@@ -39,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);
@@ -53,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);
@@ -115,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)
@@ -142,7 +167,7 @@ int php_http_array_apply_append_func(void *pDest TSRMLS_DC, int num_args, va_lis
 			}
 			add_next_index_zval(*data, *value);
 		} else if (key) {
-			zend_hash_add(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
+			zend_symtable_update(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
 		} else {
 			zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, value, sizeof(zval *), NULL);
 		}