X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=64bbef7fad0412d9e7055f115c54c7b7a4d138f2;hb=4f8c51464143f79fd4367c386e5108361ce83a42;hp=2a4884ad9d2660f9419544464bae63a127d1dc16;hpb=547af98947588b4a646ab2a10ff287a8ab8fb409;p=m6w6%2Fext-http

diff --git a/http_request_api.c b/http_request_api.c
index 2a4884a..64bbef7 100644
--- 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) {
@@ -412,7 +412,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 	/* 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, ""));
+			HTTP_CURL_OPT(ENCODING, "");
 		}
 	}
 
@@ -436,7 +436,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
 	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') */
@@ -701,7 +701,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 +862,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) {