- reverse request history

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index c80b80b21eefe5c9b26f7feefd6bc997129c4642..613c32a8820ee2f82780e378aef80ec1a4f9878c 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -244,10 +244,15 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
 
 #define HTTP_CURL_OPT(OPTION, p) HTTP_CURL_OPT_EX(request->ch, OPTION, (p))
 #define HTTP_CURL_OPT_EX(ch, OPTION, p) curl_easy_setopt((ch), OPTION, (p))
-#define HTTP_CURL_OPT_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, keyname, obdc)
+
+#define HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \
+       { \
+               char *K = #OPTION; \
+               HTTP_CURL_OPT_STRING_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION, obdc); \
+       }
 #define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \
-       if (!strcasecmp(key, #keyname)) { \
-               zval *copy = http_request_option_cache(request, #keyname, zval_copy(IS_STRING, *param)); \
+       if (!strcasecmp(key, keyname)) { \
+               zval *copy = http_request_option_cache(request, keyname, zval_copy(IS_STRING, *param)); \
                if (obdc) { \
                        HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \
                } \
@@ -255,10 +260,14 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
                key = NULL; \
                continue; \
        }
-#define HTTP_CURL_OPT_LONG(keyname) HTTP_CURL_OPT_LONG_EX(keyname, keyname)
+#define HTTP_CURL_OPT_LONG(OPTION, ldiff) \
+       { \
+               char *K = #OPTION; \
+               HTTP_CURL_OPT_LONG_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION); \
+       }
 #define HTTP_CURL_OPT_LONG_EX(keyname, optname) \
-       if (!strcasecmp(key, #keyname)) { \
-               zval *copy = http_request_option_cache(request, #keyname, zval_copy(IS_LONG, *param)); \
+       if (!strcasecmp(key, keyname)) { \
+               zval *copy = http_request_option_cache(request, keyname, zval_copy(IS_LONG, *param)); \
                HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \
                key = NULL; \
                continue; \
@@ -403,6 +412,7 @@ PHP_HTTP_API void _http_request_reset(http_request *request)
        if (request->ch) {
                http_request_defaults(request);
        }
+       request->_error[0] = '\0';
 }
 /* }}} */
 
@@ -641,9 +651,37 @@ 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;
+                               zval *cookie_val = NULL;
+                               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));
+                               }
                        }
                }
        }
@@ -688,7 +726,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                HTTP_CURL_OPT(CURLOPT_TIMEOUT, Z_LVAL_P(zoption));
        }
 
-       /* connecttimeout, defaults to 3 */
+       /* connecttimeout, defaults to 0 */
        if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) {
                HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption));
        }
@@ -702,25 +740,25 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
                FOREACH_KEYVAL(pos, zoption, key, idx, param) {
                        if (key) {
-                               HTTP_CURL_OPT_STRING(CURLOPT_SSLCERT, 1);
-                               HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTTYPE, 0);
-                               HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTPASSWD, 0);
+                               HTTP_CURL_OPT_STRING(CURLOPT_SSLCERT, 0, 1);
+                               HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTTYPE, 0, 0);
+                               HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTPASSWD, 0, 0);
 
-                               HTTP_CURL_OPT_STRING(CURLOPT_SSLKEY, 0);
-                               HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYTYPE, 0);
-                               HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYPASSWD, 0);
+                               HTTP_CURL_OPT_STRING(CURLOPT_SSLKEY, 0, 0);
+                               HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYTYPE, 0, 0);
+                               HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYPASSWD, 0, 0);
 
-                               HTTP_CURL_OPT_STRING(CURLOPT_SSLENGINE, 0);
-                               HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION);
+                               HTTP_CURL_OPT_STRING(CURLOPT_SSLENGINE, 0, 0);
+                               HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION, 0);
 
-                               HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYPEER);
-                               HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYHOST);
-                               HTTP_CURL_OPT_STRING(CURLOPT_SSL_CIPHER_LIST, 0);
+                               HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYPEER, 1);
+                               HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYHOST, 1);
+                               HTTP_CURL_OPT_STRING(CURLOPT_SSL_CIPHER_LIST, 1, 0);
 
-                               HTTP_CURL_OPT_STRING(CURLOPT_CAINFO, 1);
-                               HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, 1);
-                               HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, 1);
-                               HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, 1);
+                               HTTP_CURL_OPT_STRING(CURLOPT_CAINFO, -3, 1);
+                               HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, -3, 1);
+                               HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, -3, 1);
+                               HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, -3, 1);
 
                                /* reset key */
                                key = NULL;
@@ -834,11 +872,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
        HTTP_CURL_INFO_EX(CURLINFO_COOKIELIST, "cookies");
 #endif
+       HTTP_CURL_INFO(CURLINFO_OS_ERRNO);
+       add_assoc_string(&array, "error", request->_error, 1);
 }
 /* }}} */