* renamed HttpRequest::addHeader() to ::addHeaders() and addCookie() to ::addCookies()

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index c72b510d5b63a90a01f8ec76b9dad8b23edcc7ef..fe5d66e8f8b14e31a6d74c25cd022fbc5de0352b 100644 (file)
--- a/http.c
+++ b/http.c
@@ -308,9 +308,16 @@ zend_function_entry http_request_class_methods[] = {
        PHP_ME(HttpRequest, setOptions, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequest, getOptions, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequest, unsetOptions, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, setSslOptions, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, getSslOptions, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, unsetSslOptions, NULL, ZEND_ACC_PUBLIC)
 
-       PHP_ME(HttpRequest, addHeader, NULL, ZEND_ACC_PUBLIC)
-       PHP_ME(HttpRequest, addCookie, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, addHeaders, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, getHeaders, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, unsetHeaders, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, addCookies, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, getCookies, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, unsetCookies, NULL, ZEND_ACC_PUBLIC)
 
        PHP_ME(HttpRequest, setMethod, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequest, getMethod, NULL, ZEND_ACC_PUBLIC)
@@ -339,6 +346,7 @@ zend_function_entry http_request_class_methods[] = {
 
        PHP_ME(HttpRequest, getResponseData, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequest, getResponseHeader, NULL, ZEND_ACC_PUBLIC)
+       PHP_ME(HttpRequest, getResponseCookie, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequest, getResponseCode, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequest, getResponseBody, NULL, ZEND_ACC_PUBLIC)
        PHP_ME(HttpRequest, getResponseInfo, NULL, ZEND_ACC_PUBLIC)
@@ -384,7 +392,7 @@ static void php_http_init_globals(zend_http_globals *http_globals)
        http_globals->etag  = NULL;
        http_globals->lmod  = 0;
 #ifdef HTTP_HAVE_CURL
-       //phpstr_init_ex(&http_globals->curlbuf, HTTP_CURLBUF_SIZE, 1);
+       phpstr_init_ex(&http_globals->curlbuf, HTTP_CURLBUF_SIZE, 0);
        zend_llist_init(&http_globals->to_free, sizeof(char *), free_to_free, 0);
 #endif
        http_globals->allowed_methods = NULL;
@@ -485,7 +493,7 @@ PHP_MSHUTDOWN_FUNCTION(http)
 {
        UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
-       //phpstr_free(&HTTP_G(curlbuf));
+       phpstr_dtor(&HTTP_G(curlbuf));
        curl_global_cleanup();
 #endif
        return SUCCESS;
@@ -518,7 +526,7 @@ PHP_RSHUTDOWN_FUNCTION(http)
        }
 
 #ifdef HTTP_HAVE_CURL
-       //phpstr_free(&HTTP_G(curlbuf));
+       phpstr_dtor(&HTTP_G(curlbuf));
 #endif
 
        return SUCCESS;