X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_curl_api.c;h=f1ec92c96c2ba2ac0e11e6535b511ceb5c75c611;hp=371f39fb3b0832bd7ddd1b537f48222a37d31d9a;hb=79bfab50fb44032e89ce1a3bb0b0677a2612e7ff;hpb=71904cb99d728c43ebebb10b695fbb9ac580e66f

diff --git a/http_curl_api.c b/http_curl_api.c
index 371f39f..f1ec92c 100644
--- a/http_curl_api.c
+++ b/http_curl_api.c
@@ -31,10 +31,6 @@
 #include "php_http_curl_api.h"
 #include "php_http_std_defs.h"
 
-#ifdef ZEND_ENGINE_2
-#	include "ext/standard/php_http.h"
-#endif
-
 #include "phpstr/phpstr.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(http)
@@ -72,7 +68,7 @@ ZEND_DECLARE_MODULE_GLOBALS(http)
 	}
 
 #define http_curl_cleanup(ch, clean_curl) \
-	phpstr_free(&HTTP_G(curlbuf)); \
+	phpstr_dtor(&HTTP_G(curlbuf)); \
 	zend_llist_clean(&HTTP_G(to_free)); \
 	if (clean_curl) { \
 		curl_easy_cleanup(ch); \
@@ -298,7 +294,7 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSR
 			phpstr_fix(qstr);
 			curl_easy_setopt(ch, CURLOPT_COOKIE, http_curl_copystr(qstr->data));
 		}
-		phpstr_dtor(qstr);
+		phpstr_free(qstr);
 	}
 
 	/* cookiestore */
@@ -512,7 +508,7 @@ PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *po
 
 	status = http_post_data_ex(ch, URL, encoded, encoded_len, options, info, data, data_len);
 	efree(encoded);
-	
+
 	return status;
 }
 /* }}} */
@@ -548,4 +544,3 @@ PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL,
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
-