fix Bug #15497 HttpInflateStream::finish segfaults when passing NULL

[m6w6/ext-http] / http_request_object.c

diff --git a/http_request_object.c b/http_request_object.c
index 7f427b8c0eda5e3a915dfa0e6543ef42ee6da730..1b42347ddf1ad9114f02a7e0ef0f0d98e5c9b5b2 100644 (file)
--- a/http_request_object.c
+++ b/http_request_object.c
@@ -81,11 +81,10 @@ HTTP_BEGIN_ARGS(addCookies, 1)
 HTTP_END_ARGS;
 
 HTTP_EMPTY_ARGS(enableCookies);
-#if HTTP_CURL_VERSION(7,14,1)
 HTTP_BEGIN_ARGS(resetCookies, 0)
        HTTP_ARG_VAL(session_only, 0)
 HTTP_END_ARGS;
-#endif
+HTTP_EMPTY_ARGS(flushCookies);
 
 HTTP_EMPTY_ARGS(getUrl);
 HTTP_BEGIN_ARGS(setUrl, 1)
@@ -242,7 +241,7 @@ HTTP_BEGIN_ARGS(methodExists, 1)
        HTTP_ARG_VAL(method, 0)
 HTTP_END_ARGS;
 
-#if defined(HAVE_CURL_GETFORMDATA) || defined(HAVE_CURL_FORMGET)
+#ifdef HAVE_CURL_FORMGET
 HTTP_BEGIN_ARGS(encodeBody, 2)
        HTTP_ARG_VAL(fields, 0)
        HTTP_ARG_VAL(files, 0)
@@ -269,9 +268,8 @@ zend_function_entry http_request_object_fe[] = {
        HTTP_REQUEST_ME(setCookies, ZEND_ACC_PUBLIC)
 
        HTTP_REQUEST_ME(enableCookies, ZEND_ACC_PUBLIC)
-#if HTTP_CURL_VERSION(7,14,1)
        HTTP_REQUEST_ME(resetCookies, ZEND_ACC_PUBLIC)
-#endif
+       HTTP_REQUEST_ME(flushCookies, ZEND_ACC_PUBLIC)
 
        HTTP_REQUEST_ME(setMethod, ZEND_ACC_PUBLIC)
        HTTP_REQUEST_ME(getMethod, ZEND_ACC_PUBLIC)
@@ -338,7 +336,7 @@ zend_function_entry http_request_object_fe[] = {
        HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister)
        HTTP_REQUEST_ALIAS(methodName, http_request_method_name)
        HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists)
-#if defined(HAVE_CURL_GETFORMDATA) || defined(HAVE_CURL_FORMGET)
+#ifdef HAVE_CURL_FORMGET
        HTTP_REQUEST_ALIAS(encodeBody, http_request_body_encode)
 #endif
        EMPTY_FUNCTION_ENTRY
@@ -441,6 +439,10 @@ PHP_MINIT_FUNCTION(http_request_object)
 #      if HTTP_CURL_VERSION(7,15,2)
        zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS4")-1, CURLPROXY_SOCKS4 TSRMLS_CC);
 #      endif
+#if HTTP_CURL_VERSION(7,18,0)
+       zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS4A")-1, CURLPROXY_SOCKS5 TSRMLS_CC);
+       zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS5_HOSTNAME")-1, CURLPROXY_SOCKS5 TSRMLS_CC);
+#endif
        zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS5")-1, CURLPROXY_SOCKS5 TSRMLS_CC);
        zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_HTTP")-1, CURLPROXY_HTTP TSRMLS_CC);
 #endif /* WONKY */
@@ -551,12 +553,16 @@ static inline void _http_request_object_check_request_content_type(zval *this_pt
 STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC)
 {
        STATUS status = SUCCESS;
+       char *url = http_absolute_url(Z_STRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("url")-1, 0 TSRMLS_CC)));
 
+       if (!url) {
+               return FAILURE;
+       }
+       
        http_request_reset(obj->request);
+       obj->request->url = url;
        HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init(obj->request), return FAILURE);
        
-       obj->request->url = http_absolute_url(Z_STRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("url")-1, 0 TSRMLS_CC)));
-       
        switch (obj->request->meth = Z_LVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("method")-1, 0 TSRMLS_CC)))
        {
                case HTTP_GET:
@@ -635,7 +641,7 @@ STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_
                        
                        if (    (Z_TYPE_P(options) != IS_ARRAY)
                                ||      (SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void *) &entry)
-                               ||      (!zval_is_true(*entry)))) {
+                               ||      (!IS_CALLABLE(*entry, 0, NULL)))) {
                                MAKE_STD_ZVAL(pcb);
                                array_init(pcb);
                                ZVAL_ADDREF(getThis());
@@ -670,7 +676,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
        if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response)))) {
                zval *message;
 
-               if (zval_is_true(zend_read_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 0 TSRMLS_CC))) {
+               if (i_zend_is_true(zend_read_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 0 TSRMLS_CC))) {
                        zval *hist, *history = zend_read_property(THIS_CE, getThis(), ZEND_STRS("history")-1, 0 TSRMLS_CC);
                        http_message *response = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response));
                        http_message *request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request));
@@ -706,7 +712,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this
                zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("responseStatus")-1, "" TSRMLS_CC);
                
                /* append request message to history */
-               if (zval_is_true(zend_read_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 0 TSRMLS_CC))) {
+               if (i_zend_is_true(zend_read_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 0 TSRMLS_CC))) {
                        http_message *request;
                        
                        if ((request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) {
@@ -779,7 +785,7 @@ static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM
                }
        } else if (opts) {
                if (prettify_keys) {
-                       zend_hash_apply_with_arguments(Z_ARRVAL_P(opts), apply_pretty_key, 0);
+                       zend_hash_apply_with_arguments(Z_ARRVAL_P(opts) HTTP_ZAPI_HASH_TSRMLS_CC, apply_pretty_key, 0, NULL);
                }
                ZVAL_ADDREF(opts);
                add_assoc_zval_ex(new_opts, key, len, opts);
@@ -904,16 +910,19 @@ PHP_METHOD(HttpRequest, setOptions)
                                zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt);
                        } else if (KEYMATCH(key, "method")) {
                                zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt);
-#if HTTP_CURL_VERSION(7,14,1)
+                       } else if (KEYMATCH(key, "flushcookies")) {
+                               getObject(http_request_object, obj);
+                               if (i_zend_is_true(*opt)) {
+                                       http_request_flush_cookies(obj->request);
+                               }
                        } else if (KEYMATCH(key, "resetcookies")) {
                                getObject(http_request_object, obj);
-                               http_request_reset_cookies(obj->request, 0);
-#endif
+                               http_request_reset_cookies(obj->request, (zend_bool) i_zend_is_true(*opt));
                        } else if (KEYMATCH(key, "enablecookies")) {
                                getObject(http_request_object, obj);
                                http_request_enable_cookies(obj->request);
                        } else if (KEYMATCH(key, "recordHistory")) {
-                               zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 1 TSRMLS_CC);
+                               zend_update_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, *opt TSRMLS_CC);
                        } else if (Z_TYPE_PP(opt) == IS_NULL) {
                                old_opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC);
                                if (Z_TYPE_P(old_opts) == IS_ARRAY) {
@@ -1048,6 +1057,17 @@ PHP_METHOD(HttpRequest, resetCookies)
 }
 /* }}} */
 
+/* {{{ proto bool HttpRequest::flushCookies()
+       Flush internal cookies to the cookiestore file */
+PHP_METHOD(HttpRequest, flushCookies)
+{
+       NO_ARGS {
+               getObject(http_request_object, obj);
+               RETURN_SUCCESS(http_request_flush_cookies(obj->request));
+       }
+}
+/* }}} */
+
 /* {{{ proto bool HttpRequest::setUrl(string url)
        Set the request URL. */
 PHP_METHOD(HttpRequest, setUrl)