update curl info

[m6w6/ext-http] / php_http_misc.c

diff --git a/php_http_misc.c b/php_http_misc.c
index db588ea6be2697b50971db70f94284c00ad7273d..fa4bbbf2854add35e959331ea20fc48065acc843 100644 (file)
--- 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,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)