Merge branch 'master' into phpng

[m6w6/ext-http] / php_http_misc.h

diff --git a/php_http_misc.h b/php_http_misc.h
index 1a74c34d8262b88c5543289707627d586214c9eb..36f4020359877a501068eaa5dc359d67ed538b0c 100644 (file)
--- a/php_http_misc.h
+++ b/php_http_misc.h
@@ -27,6 +27,9 @@
 /* send buffer size */
 #define PHP_HTTP_SENDBUF_SIZE 40960
 
 /* send buffer size */
 #define PHP_HTTP_SENDBUF_SIZE 40960
 

+/* allowed characters of header field names */
+#define PHP_HTTP_HEADER_NAME_CHARS "!#$%&'*+-.^_`|~1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+

 /* SLEEP */
 
 #define PHP_HTTP_DIFFSEC (0.001)
 /* SLEEP */
 
 #define PHP_HTTP_DIFFSEC (0.001)


@@ -136,6 +139,11 @@ static inline const char *php_http_locate_bin_eol(const char *bin, size_t len, i
 
 /* ZEND */
 
 
 /* ZEND */
 

+#ifdef PHP_DEBUG
+#      undef  HASH_OF
+#      define HASH_OF(p) ((HashTable*)(Z_TYPE_P(p)==IS_ARRAY ? Z_ARRVAL_P(p) : ((Z_TYPE_P(p)==IS_OBJECT ? Z_OBJ_HT_P(p)->get_properties((p)) : NULL))))
+#endif
+

 static inline void *PHP_HTTP_OBJ(zend_object *zo, zval *zv)
 {
        if (!zo) {
 static inline void *PHP_HTTP_OBJ(zend_object *zo, zval *zv)
 {
        if (!zo) {


@@ -163,7 +171,7 @@ static inline ZEND_RESULT_CODE php_http_ini_entry(const char *name_str, size_t n
 {
        zend_ini_entry *ini_entry;
 
 {
        zend_ini_entry *ini_entry;
 

-       if (ini_entry == zend_hash_str_find_ptr(EG(ini_directives), name_str, name_len)) {
+       if ((ini_entry = zend_hash_str_find_ptr(EG(ini_directives), name_str, name_len))) {

                if (orig && ini_entry->modified) {
                        *val_str = ini_entry->orig_value->val;
                        *val_len = ini_entry->orig_value->len;
                if (orig && ini_entry->modified) {
                        *val_str = ini_entry->orig_value->val;
                        *val_len = ini_entry->orig_value->len;


@@ -176,6 +184,9 @@ static inline ZEND_RESULT_CODE php_http_ini_entry(const char *name_str, size_t n
        return FAILURE;
 }
 
        return FAILURE;
 }
 

+#define Z_ISUSER(zv) (Z_TYPE(zv) <= 10)
+#define Z_ISUSER_P(zvp) Z_ISUSER(*(zvp))
+

 #define RETVAL_STR_COPY(zs) ZVAL_STR_COPY(return_value, zs)
 #define RETURN_STR_COPY(zs) do { \
        ZVAL_STR_COPY(return_value, zs); \
 #define RETVAL_STR_COPY(zs) ZVAL_STR_COPY(return_value, zs)
 #define RETURN_STR_COPY(zs) do { \
        ZVAL_STR_COPY(return_value, zs); \


@@ -222,7 +233,7 @@ static inline void *php_http_arrkey_stringify(php_http_arrkey_t *arrkey, zend_ha
        }
 
        if (key) {
        }
 
        if (key) {

-               memcpy(&arrkey, key, sizeof(*key));
+               memcpy(arrkey, key, sizeof(*key));

        }
        if ((arrkey->stringified = !arrkey->key)) {
                arrkey->key = zend_long_to_str(arrkey->h);
        }
        if ((arrkey->stringified = !arrkey->key)) {
                arrkey->key = zend_long_to_str(arrkey->h);