prepare v4.2.5

[m6w6/ext-http] / src / php_http_client_request.c

diff --git a/src/php_http_client_request.c b/src/php_http_client_request.c
index 71a9129e3f994f6513c64c023c88ae66afcafb26..52e9c7098126143aacc7fe56ad565b9ada557002 100644 (file)
--- a/src/php_http_client_request.c
+++ b/src/php_http_client_request.c
@@ -230,7 +230,7 @@ ZEND_END_ARG_INFO();
 static PHP_METHOD(HttpClientRequest, getOptions)
 {
        if (SUCCESS == zend_parse_parameters_none()) {
-               zval tmp, *zoptions = zend_read_property(php_http_client_request_class_entry, getThis(), ZEND_STRL("options"), 0, &tmp);
+               zval tmp, *zoptions = zend_read_property(php_http_client_request_class_entry, Z_OBJ_P(ZEND_THIS), ZEND_STRL("options"), 0, &tmp);
                RETURN_ZVAL(zoptions, 1, 0);
        }
 }
@@ -273,7 +273,7 @@ static PHP_METHOD(HttpClientRequest, getSslOptions)
 }
 
 static zend_function_entry php_http_client_request_methods[] = {
-       PHP_ME(HttpClientRequest, __construct,    ai_HttpClientRequest___construct,    ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
+       PHP_ME(HttpClientRequest, __construct,    ai_HttpClientRequest___construct,    ZEND_ACC_PUBLIC)
        PHP_ME(HttpClientRequest, setContentType, ai_HttpClientRequest_setContentType, ZEND_ACC_PUBLIC)
        PHP_ME(HttpClientRequest, getContentType, ai_HttpClientRequest_getContentType, ZEND_ACC_PUBLIC)
        PHP_ME(HttpClientRequest, setQuery,       ai_HttpClientRequest_setQuery,       ZEND_ACC_PUBLIC)