branch off v1 as R_1_7
[m6w6/ext-http] / http_message_object.c
index 40001b5375c2e31f750046a536a8b95a4f318e08..0856aefc66afd28b7447f2524e51c30ea4d61387 100644 (file)
@@ -146,11 +146,11 @@ HTTP_END_ARGS;
 HTTP_EMPTY_ARGS(reverse);
 
 #define http_message_object_read_prop _http_message_object_read_prop
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
+static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC);
 #define http_message_object_write_prop _http_message_object_write_prop
-static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
+static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC);
 #define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr
-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC);
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC);
 #define http_message_object_get_props _http_message_object_get_props
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
 
@@ -214,7 +214,7 @@ static zend_object_handlers http_message_object_handlers;
 
 static HashTable http_message_object_prophandlers;
 
-typedef void (*http_message_object_prophandler_func)(http_message_object *, zval *);
+typedef void (*http_message_object_prophandler_func)(http_message_object *o, zval *v TSRMLS_DC);
 
 typedef struct _http_message_object_prophandler {
        http_message_object_prophandler_func read;
@@ -228,106 +228,106 @@ static STATUS http_message_object_add_prophandler(const char *prop_str, size_t p
 static STATUS http_message_object_get_prophandler(const char *prop_str, size_t prop_len, http_message_object_prophandler **handler) {
        return zend_hash_find(&http_message_object_prophandlers, prop_str, prop_len, (void *) handler);
 }
-static void http_message_object_prophandler_get_type(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_type(http_message_object *obj, zval *return_value TSRMLS_DC) {
        RETVAL_LONG(obj->message->type);
 }
-static void http_message_object_prophandler_set_type(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_type(http_message_object *obj, zval *value TSRMLS_DC) {
        zval *cpy = http_zsep(IS_LONG, value);
        http_message_set_type(obj->message, Z_LVAL_P(cpy));
        zval_ptr_dtor(&cpy);
 }
-static void http_message_object_prophandler_get_body(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_body(http_message_object *obj, zval *return_value TSRMLS_DC) {
        phpstr_fix(PHPSTR(obj->message));
        RETVAL_PHPSTR(PHPSTR(obj->message), 0, 1);
 }
-static void http_message_object_prophandler_set_body(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_body(http_message_object *obj, zval *value TSRMLS_DC) {
        zval *cpy = http_zsep(IS_STRING, value);
        phpstr_dtor(PHPSTR(obj->message));
        phpstr_from_string_ex(PHPSTR(obj->message), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy));
        zval_ptr_dtor(&cpy);
 }
-static void http_message_object_prophandler_get_request_method(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_request_method(http_message_object *obj, zval *return_value TSRMLS_DC) {
        if (HTTP_MSG_TYPE(REQUEST, obj->message) && obj->message->http.info.request.method) {
                RETVAL_STRING(obj->message->http.info.request.method, 1);
        } else {
                RETVAL_NULL();
        }
 }
-static void http_message_object_prophandler_set_request_method(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_request_method(http_message_object *obj, zval *value TSRMLS_DC) {
        if (HTTP_MSG_TYPE(REQUEST, obj->message)) {
                zval *cpy = http_zsep(IS_STRING, value);
                STR_SET(obj->message->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
                zval_ptr_dtor(&cpy);
        }
 }
-static void http_message_object_prophandler_get_request_url(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_request_url(http_message_object *obj, zval *return_value TSRMLS_DC) {
        if (HTTP_MSG_TYPE(REQUEST, obj->message) && obj->message->http.info.request.url) {
                RETVAL_STRING(obj->message->http.info.request.url, 1);
        } else {
                RETVAL_NULL();
        }
 }
-static void http_message_object_prophandler_set_request_url(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_request_url(http_message_object *obj, zval *value TSRMLS_DC) {
        if (HTTP_MSG_TYPE(REQUEST, obj->message)) {
                zval *cpy = http_zsep(IS_STRING, value);
                STR_SET(obj->message->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
                zval_ptr_dtor(&cpy);
        }
 }
-static void http_message_object_prophandler_get_response_status(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_response_status(http_message_object *obj, zval *return_value TSRMLS_DC) {
        if (HTTP_MSG_TYPE(RESPONSE, obj->message) && obj->message->http.info.response.status) {
                RETVAL_STRING(obj->message->http.info.response.status, 1);
        } else {
                RETVAL_NULL();
        }
 }
-static void http_message_object_prophandler_set_response_status(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_response_status(http_message_object *obj, zval *value TSRMLS_DC) {
        if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
                zval *cpy = http_zsep(IS_STRING, value);
                STR_SET(obj->message->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)));
                zval_ptr_dtor(&cpy);
        }
 }
-static void http_message_object_prophandler_get_response_code(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_response_code(http_message_object *obj, zval *return_value TSRMLS_DC) {
        if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
                RETVAL_LONG(obj->message->http.info.response.code);
        } else {
                RETVAL_NULL();
        }
 }
-static void http_message_object_prophandler_set_response_code(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_response_code(http_message_object *obj, zval *value TSRMLS_DC) {
        if (HTTP_MSG_TYPE(RESPONSE, obj->message)) {
                zval *cpy = http_zsep(IS_LONG, value);
                obj->message->http.info.response.code = Z_LVAL_P(cpy);
                zval_ptr_dtor(&cpy);
        }
 }
-static void http_message_object_prophandler_get_http_version(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_http_version(http_message_object *obj, zval *return_value TSRMLS_DC) {
        RETVAL_DOUBLE(obj->message->http.version);
 }
-static void http_message_object_prophandler_set_http_version(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_http_version(http_message_object *obj, zval *value TSRMLS_DC) {
        zval *cpy = http_zsep(IS_DOUBLE, value);
        obj->message->http.version = Z_DVAL_P(cpy);
        zval_ptr_dtor(&cpy);
 }
-static void http_message_object_prophandler_get_headers(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_headers(http_message_object *obj, zval *return_value TSRMLS_DC) {
        array_init(return_value);
        zend_hash_copy(Z_ARRVAL_P(return_value), &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
 }
-static void http_message_object_prophandler_set_headers(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_headers(http_message_object *obj, zval *value TSRMLS_DC) {
        zval *cpy = http_zsep(IS_ARRAY, value);
        zend_hash_clean(&obj->message->hdrs);
        zend_hash_copy(&obj->message->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
        zval_ptr_dtor(&cpy);
 }
-static void http_message_object_prophandler_get_parent_message(http_message_object *obj, zval *return_value) {
+static void http_message_object_prophandler_get_parent_message(http_message_object *obj, zval *return_value TSRMLS_DC) {
        if (obj->message->parent) {
                RETVAL_OBJVAL(obj->parent, 1);
        } else {
                RETVAL_NULL();
        }
 }
-static void http_message_object_prophandler_set_parent_message(http_message_object *obj, zval *value) {
+static void http_message_object_prophandler_set_parent_message(http_message_object *obj, zval *value TSRMLS_DC) {
        if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) {
                if (obj->message->parent) {
                        zval tmp;
@@ -513,9 +513,15 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
                }
        }
 
+       
+#ifdef ZEND_ENGINE_2_4
+       zend_object_std_init(o, ce TSRMLS_CC);
+       object_properties_init(o, ce);
+#else
        ALLOC_HASHTABLE(OBJ_PROP(o));
        zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
        zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
+#endif
 
        ov.handle = putObject(http_message_object, o);
        ov.handlers = &http_message_object_handlers;
@@ -558,7 +564,7 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
        freeObject(o);
 }
 
-static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC) {
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_GET_PPTR_TYPE_DC ZEND_LITERAL_KEY_DC TSRMLS_DC) {
        getObjectEx(http_message_object, obj, object);
        http_message_object_prophandler *handler;
        
@@ -567,10 +573,10 @@ static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRML
                return NULL;
        }
 
-       return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+       return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_GET_PPTR_TYPE_CC ZEND_LITERAL_KEY_CC TSRMLS_CC);
 }
 
-static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
+static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC)
 {
        getObjectEx(http_message_object, obj, object);
        http_message_object_prophandler *handler;
@@ -591,24 +597,24 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
                return_value->is_ref = 0;
 #endif
 
-               handler->read(obj, return_value);
+               handler->read(obj, return_value TSRMLS_CC);
 
        } else {
-               return_value = zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
+               return_value = zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC);
        }
        
        return return_value;
 }
 
-static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC)
+static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC)
 {
        getObjectEx(http_message_object, obj, object);
        http_message_object_prophandler *handler;
        
        if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) {
-               handler->write(obj, value);
+               handler->write(obj, value TSRMLS_CC);
        } else {
-               zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
+               zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC);
        }
 }
 
@@ -617,9 +623,12 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
        zval *headers;
        getObjectEx(http_message_object, obj, object);
        http_message *msg = obj->message;
-       HashTable *props = OBJ_PROP(obj);
        zval array, *parent;
-       
+#ifdef ZEND_ENGINE_2_4
+       HashTable *props = zend_get_std_object_handlers()->get_properties(object TSRMLS_CC);
+#else
+       HashTable *props = OBJ_PROP(obj);
+#endif
        INIT_ZARR(array, props);
 
 #define ASSOC_PROP(array, ptype, name, val) \
@@ -681,7 +690,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
        }
        ASSOC_PROP(array, zval, "parentMessage", parent);
 
-       return OBJ_PROP(obj);
+       return props;
 }
 
 /* ### USERLAND ### */
@@ -1000,7 +1009,7 @@ PHP_METHOD(HttpMessage, setResponseStatus)
        
        HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
        
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
                RETURN_FALSE;
        }
        STR_SET(obj->message->http.info.response.status, estrndup(status, status_len));
@@ -1100,11 +1109,11 @@ PHP_METHOD(HttpMessage, getHttpVersion)
        NO_ARGS;
 
        if (return_value_used) {
-               char ver[4] = {0};
+               char *version;
                getObject(http_message_object, obj);
 
-               sprintf(ver, "%1.1lf", obj->message->http.version);
-               RETURN_STRINGL(ver, 3, 1);
+               spprintf(&version, 0, "%1.1F", obj->message->http.version);
+               RETURN_STRING(version, 0);
        }
 }
 /* }}} */
@@ -1113,8 +1122,8 @@ PHP_METHOD(HttpMessage, getHttpVersion)
        Set the HTTP Protocol version of the Message. */
 PHP_METHOD(HttpMessage, setHttpVersion)
 {
-       char v[4];
        zval *zv;
+       char *version;
        getObject(http_message_object, obj);
 
        if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &zv)) {
@@ -1122,12 +1131,13 @@ PHP_METHOD(HttpMessage, setHttpVersion)
        }
 
        convert_to_double(zv);
-       snprintf(v, sizeof(v), "%1.1f", Z_DVAL_P(zv));
-       if (strcmp(v, "1.0") && strcmp(v, "1.1")) {
+       spprintf(&version, 0, "%1.1F", Z_DVAL_P(zv));
+       if (strcmp(version, "1.0") && strcmp(version, "1.1")) {
+               efree(version);
                http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %g", Z_DVAL_P(zv));
                RETURN_FALSE;
        }
-
+       efree(version);
        obj->message->http.version = Z_DVAL_P(zv);
        RETURN_TRUE;
 }