- more default curl options

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 2a4884ad9d2660f9419544464bae63a127d1dc16..aac05fd62f2937be778d4a75d089cd3868b01b28 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -153,7 +153,7 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC)
        {
                case COPY_STRING:
                {
-                       char *new_str = estrdup((const char*) data);
+                       char *new_str = estrdup(data);
                        zend_llist_add_element(&HTTP_G(request).copies.strings, &new_str);
                        return new_str;
                }
@@ -318,7 +318,7 @@ PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC)
 /* }}} */
 
 /* {{{ STATUS http_request_init(CURL *, http_request_method, char *, http_request_body *, HashTable *, phpstr *) */
-PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC)
 {
        zval *zoption;
        zend_bool range_req = 0;
@@ -330,7 +330,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 
        /* set options */
        if (url) {
-               HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, (void *) url));
+               HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, url));
        }
 
        if (response) {
@@ -410,10 +410,10 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 #endif
 
        /* compress, empty string enables deflate and gzip */
-       if (zoption = http_curl_getopt(options, "compress", IS_BOOL)) {
-               if (Z_LVAL_P(zoption)) {
-                       HTTP_CURL_OPT(ENCODING, http_request_data_copy(COPY_STRING, ""));
-               }
+       if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
+               HTTP_CURL_OPT(ENCODING, "");
+       } else {
+               HTTP_CURL_OPT(ENCODING, 0);
        }
 
        /* redirects, defaults to 0 */
@@ -430,13 +430,15 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
        /* referer */
        if (zoption = http_curl_getopt(options, "referer", IS_STRING)) {
                HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
+       } else {
+               HTTP_CURL_OPT(REFERER, NULL);
        }
 
        /* useragent, default "PECL::HTTP/version (PHP/version)" */
        if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) {
                HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
        } else {
-               HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")"));
+               HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
        }
 
        /* additional headers, array('name' => 'value') */
@@ -489,34 +491,60 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
                        HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data));
                }
                phpstr_free(qstr);
+       } else {
+               HTTP_CURL_OPT(COOKIE, NULL);
        }
 
-       /* cookiestore */
-       if (zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) {
+       /* session cookies */
+       if (zoption = http_curl_getopt(options, "cookiesession", IS_BOOL)) {
+               if (Z_LVAL_P(zoption)) {
+                       /* accept cookies for this session */
+                       HTTP_CURL_OPT(COOKIEFILE, "");
+               } else {
+                       /* reset session cookies */
+                       HTTP_CURL_OPT(COOKIESESSION, 1);
+               }
+       } else {
+               HTTP_CURL_OPT(COOKIEFILE, NULL);
+       }
+       
+       /* cookiestore, read initial cookies from that file and store cookies back into that file */
+       if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) {
                HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
                HTTP_CURL_OPT(COOKIEJAR, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
+       } else {
+               HTTP_CURL_OPT(COOKIEFILE, NULL);
+               HTTP_CURL_OPT(COOKIEJAR, NULL);
        }
 
        /* resume */
        if (zoption = http_curl_getopt(options, "resume", IS_LONG)) {
                range_req = 1;
                HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption));
+       } else {
+               HTTP_CURL_OPT(RESUME_FROM, 0);
        }
 
        /* maxfilesize */
        if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) {
                HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
+       } else {
+               HTTP_CURL_OPT(MAXFILESIZE, 0);
        }
 
        /* lastmodified */
        if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) {
                HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
                HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
+       } else {
+               HTTP_CURL_OPT(TIMEVALUE, 0);
        }
 
        /* timeout */
        if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
                HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
+       } else {
+               HTTP_CURL_OPT(TIMEOUT, 1);
        }
 
        /* connecttimeout, defaults to 1 */
@@ -701,7 +729,7 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
 /* }}} */
 
 /* {{{ STATUS http_request_ex(CURL *, http_request_method, char *, http_request_body, HashTable, HashTable, phpstr *) */
-PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
+PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
 {
        STATUS status;
        zend_bool clean_curl;
@@ -862,7 +890,6 @@ static size_t http_curl_write_callback(char *buf, size_t len, size_t n, void *s)
 /* {{{ static size_t http_curl_read_callback(void *, size_t, size_t, void *) */
 static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s)
 {
-       static char *offset = NULL, *original = NULL;
        HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body);
 
        if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {