fix curl_multi with libevent2

[m6w6/ext-http] / php_http_misc.h

diff --git a/php_http_misc.h b/php_http_misc.h
index 0a63a0476eb38618af1d42995ab42e059404faeb..972ba92855c3e99db3b2041c1ea27513267aeeed 100644 (file)
--- a/php_http_misc.h
+++ b/php_http_misc.h
@@ -137,10 +137,10 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 {
        const char *eol;
 
-       for (eol = bin; eol - bin < len; ++eol) {
+       for (eol = bin; eol - bin <= len; ++eol) {
                if (*eol == '\r' || *eol == '\n') {
                        if (eol_len) {
-                               *eol_len = eol ? ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1) : 0;
+                               *eol_len = ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1);
                        }
                        return eol;
                }
@@ -396,6 +396,20 @@ typedef struct php_http_array_hashkey {
 } php_http_array_hashkey_t;
 #define php_http_array_hashkey_init(dup) {NULL, 0, 0, (dup), 0}
 
+static inline void php_http_array_hashkey_stringify(php_http_array_hashkey_t *key)
+{
+       if (key->type != HASH_KEY_IS_STRING) {
+               key->len = spprintf(&key->str, 0, "%lu", key->num) + 1;
+       }
+}
+
+static inline void php_http_array_hashkey_stringfree(php_http_array_hashkey_t *key)
+{
+       if (key->type != HASH_KEY_IS_STRING || key->dup) {
+               STR_FREE(key->str);
+       }
+}
+
 #define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, HASH_OF(array), val)
 #define FOREACH_HASH_VAL(pos, hash, val) \
        for (   zend_hash_internal_pointer_reset_ex(hash, &pos); \