projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- improved range checking
[m6w6/ext-http]
/
http_curl_api.c
diff --git
a/http_curl_api.c
b/http_curl_api.c
index 371f39fb3b0832bd7ddd1b537f48222a37d31d9a..f1ec92c96c2ba2ac0e11e6535b511ceb5c75c611 100644
(file)
--- 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"
#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)
#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) \
}
#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); \
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_fix(qstr);
curl_easy_setopt(ch, CURLOPT_COOKIE, http_curl_copystr(qstr->data));
}
- phpstr_
dtor
(qstr);
+ phpstr_
free
(qstr);
}
/* cookiestore */
}
/* 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);
status = http_post_data_ex(ch, URL, encoded, encoded_len, options, info, data, data_len);
efree(encoded);
-
+
return status;
}
/* }}} */
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
*/
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
-