- need php_stream_open_wrapper_*ex* to pass a stream context

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 308212c5120a51646e6642679c1455ff796fc737..e34b866330acc551cb4dccc08b36eef94f40616a 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -412,6 +412,7 @@ PHP_HTTP_API void _http_request_reset(http_request *request)
        if (request->ch) {
                http_request_defaults(request);
        }
+       request->_error[0] = '\0';
 }
 /* }}} */
 
@@ -428,6 +429,10 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
                HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0);
                HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL);
                HTTP_CURL_OPT(CURLOPT_PORT, 0);
+#if HTTP_CURL_VERSION(7,15,2)
+               HTTP_CURL_OPT(CURLOPT_LOCALPORT, 0);
+               HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0);
+#endif
                HTTP_CURL_OPT(CURLOPT_USERPWD, NULL);
                HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0);
                HTTP_CURL_OPT(CURLOPT_ENCODING, NULL);
@@ -437,7 +442,7 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
                HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
                HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL);
                HTTP_CURL_OPT(CURLOPT_COOKIE, NULL);
-#if LIBCURL_VERSION_NUM >= 0x070e01
+#if HTTP_CURL_VERSION(7,14,1)
                HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL);
 #endif
                HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL);
@@ -539,6 +544,27 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        /* outgoing interface */
        if ((zoption = http_request_option(request, options, "interface", IS_STRING))) {
                HTTP_CURL_OPT(CURLOPT_INTERFACE, Z_STRVAL_P(zoption));
+               
+#if HTTP_CURL_VERSION(7,15,2)
+               if ((zoption = http_request_option(request, options, "portrange", IS_ARRAY))) {
+                       zval *prs, *pre;
+                       
+                       zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
+                       if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &prs)) {
+                               zend_hash_move_forward(Z_ARRVAL_P(zoption));
+                               if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &pre)) {
+                                       zval *prs_cpy = zval_copy(IS_LONG, *prs), *pre_cpy = zval_copy(IS_LONG, *pre);
+                                       
+                                       if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) {
+                                               HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy)));
+                                               HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, ABS(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L);
+                                       }
+                                       zval_free(&prs_cpy);
+                                       zval_free(&pre_cpy);
+                               }
+                       }
+               }
+#endif
        }
 
        /* another port */
@@ -650,14 +676,41 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
                phpstr_dtor(&request->_cache.cookies);
                if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) {
-                       if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) {
+                       zval *urlenc_cookies = NULL;
+                       /* check whether cookies should not be urlencoded; default is to urlencode them */
+                       if ((!(urlenc_cookies = http_request_option(request, options, "encodecookies", IS_BOOL))) || Z_BVAL_P(urlenc_cookies)) {
+                               if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", lenof("; "), NULL, 0)) {
+                                       phpstr_fix(&request->_cache.cookies);
+                                       HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data);
+                               }
+                       } else {
+                               HashPosition pos;
+                               char *cookie_key = NULL;
+                               ulong cookie_idx;
+                               
+                               FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) {
+                                       if (cookie_key) {
+                                               zval **cookie_val;
+                                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
+                                                       zval *val = zval_copy(IS_STRING, *cookie_val);
+                                                       phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val));
+                                                       zval_free(&val);
+                                               }
+
+                                               /* reset */
+                                               cookie_key = NULL;
+                                       }
+                               }
+                               
                                phpstr_fix(&request->_cache.cookies);
-                               HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data);
+                               if (PHPSTR_LEN(&request->_cache.cookies)) {
+                                       HTTP_CURL_OPT(CURLOPT_COOKIE, PHPSTR_VAL(&request->_cache.cookies));
+                               }
                        }
                }
        }
 
-#if LIBCURL_VERSION_NUM >= 0x070e01
+#if HTTP_CURL_VERSION(7,14,1)
        /* reset cookies */
        if ((zoption = http_request_option(request, options, "resetcookies", IS_BOOL)) && Z_LVAL_P(zoption)) {
                HTTP_CURL_OPT(CURLOPT_COOKIELIST, "ALL");
@@ -843,11 +896,12 @@ PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info)
        HTTP_CURL_INFO(CURLINFO_CONTENT_TYPE);
        HTTP_CURL_INFO(CURLINFO_HTTPAUTH_AVAIL);
        HTTP_CURL_INFO(CURLINFO_PROXYAUTH_AVAIL);
-       /*HTTP_CURL_INFO(OS_ERRNO);*/
        HTTP_CURL_INFO(CURLINFO_NUM_CONNECTS);
-#if LIBCURL_VERSION_NUM >= 0x070e01
+#if HTTP_CURL_VERSION(7,14,1)
        HTTP_CURL_INFO_EX(CURLINFO_COOKIELIST, "cookies");
 #endif
+       HTTP_CURL_INFO(CURLINFO_OS_ERRNO);
+       add_assoc_string(&array, "error", request->_error, 1);
 }
 /* }}} */