* strlen("") => sizeof("")-1

* major meltdown for the curl api

diff --git a/http_api.c b/http_api.c
index bee02cc01ff592551d911c0ee11bd5b6d006b1a2..5840edacb94123622c91fb3377bf9e06b3b80fda 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -564,7 +564,7 @@ PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode
 PHP_HTTP_API inline int _http_is_range_request(TSRMLS_D)
 {
        return zend_hash_exists(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]),
-               "HTTP_RANGE", strlen("HTTP_RANGE") + 1);
+               "HTTP_RANGE", sizeof("HTTP_RANGE"));
 }
 /* }}} */
 
@@ -1036,13 +1036,13 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges,
        HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO);
        range = Z_STRVAL_P(zrange);
 
-       if (strncmp(range, "bytes=", strlen("bytes="))) {
+       if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) {
                php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes=");
                return RANGE_NO;
        }
 
        ptr = &begin;
-       range += strlen("bytes=");
+       range += sizeof("bytes=") - 1;
 
        do {
                switch (c = *(range++))
@@ -1464,8 +1464,8 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
        if (!strncmp(header, "HTTP/1.", 7)) {
                char *end = strstr(header, HTTP_CRLF);
                add_assoc_stringl(array, "Status",
-                       header + strlen("HTTP/1.x "),
-                       end - (header + strlen("HTTP/1.x ")), 1);
+                       header + sizeof("HTTP/1.x ") - 1,
+                       end - (header + sizeof("HTTP/1.x ") - 1), 1);
                header = end + 2;
        }
 
@@ -1588,4 +1588,4 @@ PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
- 
+

diff --git a/http_curl_api.c b/http_curl_api.c
index dde417aa899876c0b2288652b310e2f20fc040de..24524ced68d42af020016b7df7d27b8fad825b27 100644 (file)
--- a/http_curl_api.c
+++ b/http_curl_api.c
@@ -38,23 +38,71 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
+#define http_curl_startup(ch, clean_curl, URL, options) \
+       if (!ch) { \
+               if (!(ch = curl_easy_init())) { \
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl"); \
+                       return FAILURE; \
+               } \
+               clean_curl = 1; \
+       } \
+       http_curl_initbuf(); \
+       http_curl_setopts(ch, URL, options);
+               
+
+#define http_curl_cleanup(ch, clean_curl) \
+       http_curl_freestr(); \
+       http_curl_freebuf(); \
+       if (clean_curl) { \
+               curl_easy_cleanup(ch); \
+               ch = NULL; \
+       }
+
+#define http_curl_freestr() \
+       zend_llist_clean(&HTTP_G(to_free))
+
+#define http_curl_initbuf() http_curl_initbuf_ex(0)
+
+#define http_curl_initbuf_ex(chunk_size) \
+       { \
+               size_t size = (chunk_size > 0) ? chunk_size : HTTP_CURLBUF_SIZE; \
+               http_curl_freebuf(); \
+               HTTP_G(curlbuf).data = emalloc(size); \
+               HTTP_G(curlbuf).free = size; \
+               HTTP_G(curlbuf).size = size; \
+       }
+
+#define http_curl_freebuf() \
+       if (HTTP_G(curlbuf).data) { \
+               efree(HTTP_G(curlbuf).data); \
+               HTTP_G(curlbuf).data = NULL; \
+       } \
+       HTTP_G(curlbuf).used = 0; \
+       HTTP_G(curlbuf).free = 0; \
+       HTTP_G(curlbuf).size = 0;
+
+#define http_curl_copybuf(data, size) \
+       * size = HTTP_G(curlbuf).used; \
+       * data = ecalloc(1, HTTP_G(curlbuf).used + 1); \
+       memcpy(* data, HTTP_G(curlbuf).data, * size);
+
+#define http_curl_sizebuf(for_size) \
+       { \
+               size_t size = (for_size); \
+               if (size > HTTP_G(curlbuf).free) { \
+                       size_t bsize = HTTP_G(curlbuf).size; \
+                       while (size > bsize) { \
+                               bsize *= 2; \
+                       } \
+                       HTTP_G(curlbuf).data = erealloc(HTTP_G(curlbuf).data, HTTP_G(curlbuf).used + bsize); \
+                       HTTP_G(curlbuf).free += bsize; \
+               } \
+       }
+               
+
 #define http_curl_copystr(s) _http_curl_copystr((s) TSRMLS_CC)
 static inline char *_http_curl_copystr(const char *str TSRMLS_DC);
-#define http_curl_freestr() _http_curl_freestr(TSRMLS_C)
-static inline void _http_curl_freestr(TSRMLS_D);
-
-#define http_curl_initbuf() _http_curl_initbuf_ex(0 TSRMLS_CC)
-#define http_curl_initbuf_ex(s) _http_curl_initbuf_ex((s) TSRMLS_CC)
-static inline void _http_curl_initbuf_ex(size_t chunk_size TSRMLS_DC);
-
-#define http_curl_freebuf() _http_curl_freebuf(TSRMLS_C)
-static inline void _http_curl_freebuf(TSRMLS_D);
-#define http_curl_sizebuf(l) _http_curl_sizebuf((l) TSRMLS_CC)
-static inline void _http_curl_sizebuf(size_t len TSRMLS_DC);
-#define http_curl_movebuf(d, l) _http_curl_movebuf((d), (l) TSRMLS_CC)
-static inline void _http_curl_movebuf(char **data, size_t *data_len TSRMLS_DC);
-#define http_curl_copybuf(d, l) _http_curl_copybuf((d), (l) TSRMLS_CC)
-static inline void _http_curl_copybuf(char **data, size_t *data_len TSRMLS_DC);
+
 #define http_curl_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC)
 static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC);
 
@@ -73,7 +121,7 @@ static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRML
 #define http_curl_getinfoname(i) _http_curl_getinfoname((i) TSRMLS_CC)
 static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC);
 
-/* {{{ */
+/* {{{ static inline char *http_curl_copystr(char *) */
 static inline char *_http_curl_copystr(const char *str TSRMLS_DC)
 {
        char *new_str = estrdup(str);
@@ -82,71 +130,6 @@ static inline char *_http_curl_copystr(const char *str TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ */
-static inline void _http_curl_freestr(TSRMLS_D)
-{
-       zend_llist_clean(&HTTP_G(to_free));
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_initbuf(size_t chunk_size) */
-static inline void _http_curl_initbuf_ex(size_t chunk_size TSRMLS_DC)
-{
-       size_t size = (chunk_size > 0) ? chunk_size : HTTP_CURLBUF_SIZE;
-
-       http_curl_freebuf();
-
-       HTTP_G(curlbuf).data = emalloc(size);
-       HTTP_G(curlbuf).free = size;
-       HTTP_G(curlbuf).size = size;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_freebuf(void) */
-static inline void _http_curl_freebuf(TSRMLS_D)
-{
-       if (HTTP_G(curlbuf).data) {
-               efree(HTTP_G(curlbuf).data);
-               HTTP_G(curlbuf).data = NULL;
-       }
-       HTTP_G(curlbuf).used = 0;
-       HTTP_G(curlbuf).free = 0;
-       HTTP_G(curlbuf).size = 0;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_copybuf(char **, size_t *) */
-static inline void _http_curl_copybuf(char **data, size_t *data_len TSRMLS_DC)
-{
-       *data_len = HTTP_G(curlbuf).used;
-
-       *data = ecalloc(1, HTTP_G(curlbuf).used + 1);
-       memcpy(*data, HTTP_G(curlbuf).data, *data_len);
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_movebuf(char **, size_t *) */
-static inline void _http_curl_movebuf(char **data, size_t *data_len TSRMLS_DC)
-{
-       http_curl_copybuf(data, data_len);
-       http_curl_freebuf();
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_sizebuf(size_t len) */
-static inline void _http_curl_sizebuf(size_t len TSRMLS_DC)
-{
-       if (len > HTTP_G(curlbuf).free) {
-               size_t bsize = HTTP_G(curlbuf).size;
-               while (bsize < len) {
-                       bsize *= 2;
-               }
-               HTTP_G(curlbuf).data = erealloc(HTTP_G(curlbuf).data, HTTP_G(curlbuf).used + bsize);
-               HTTP_G(curlbuf).free += bsize;
-       }
-}
-/* }}} */
-
 /* {{{ static size_t http_curl_body_callback(char *, size_t, size_t, void *) */
 static size_t http_curl_body_callback(char *buf, size_t len, size_t n, void *s)
 {
@@ -518,130 +501,83 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
 }
 /* }}} */
 
-
-
-/* {{{ STATUS http_get(char *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
-       HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
-       STATUS rs;
-       CURL *ch = curl_easy_init();
-
-       if (!ch) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-               return FAILURE;
-       }
-
-       rs = http_get_ex(ch, URL, options, info, data, data_len);
-       curl_easy_cleanup(ch);
-       return rs;
-}
-/* }}} */
-
 /* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, char **, size_t *) */
 PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
        HashTable *info, char **data, size_t *data_len TSRMLS_DC)
 {
-       http_curl_initbuf();
-       http_curl_setopts(ch, URL, options);
+       zend_bool clean_curl = 0;
+       
+       http_curl_startup(ch, clean_curl, URL, options);
        curl_easy_setopt(ch, CURLOPT_NOBODY, 0);
        curl_easy_setopt(ch, CURLOPT_POST, 0);
 
        if (CURLE_OK != curl_easy_perform(ch)) {
-               http_curl_freebuf();
-               http_curl_freestr();
+               http_curl_cleanup(ch, clean_curl);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
                return FAILURE;
        }
+       
        if (info) {
                http_curl_getinfo(ch, info);
        }
-       http_curl_movebuf(data, data_len);
-       http_curl_freestr();
+       
+       http_curl_copybuf(data, data_len);
+       http_curl_cleanup(ch, clean_curl);
+       
        return SUCCESS;
 }
 
-/* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */
-PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
-       HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
-       STATUS rs;
-       CURL *ch = curl_easy_init();
-
-       if (!ch) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-               return FAILURE;
-       }
-
-       rs = http_head_ex(ch, URL, options, info, data, data_len);
-       curl_easy_cleanup(ch);
-       return rs;
-}
-/* }}} */
-
 /* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, char **data, size_t *) */
 PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,
        HashTable *info, char **data, size_t *data_len TSRMLS_DC)
 {
-       http_curl_initbuf();
-       http_curl_setopts(ch, URL, options);
+       zend_bool clean_curl = 0;
+       
+       http_curl_startup(ch, clean_curl, URL, options);
        curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
        curl_easy_setopt(ch, CURLOPT_POST, 0);
 
        if (CURLE_OK != curl_easy_perform(ch)) {
-               http_curl_freebuf();
-               http_curl_freestr();
+               http_curl_cleanup(ch, clean_curl);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
                return FAILURE;
        }
+       
        if (info) {
                http_curl_getinfo(ch, info);
        }
-       http_curl_movebuf(data, data_len);
-       http_curl_freestr();
+       
+       http_curl_copybuf(data, data_len);
+       http_curl_cleanup(ch, clean_curl);
+       
        return SUCCESS;
 }
 
-/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
-       size_t postdata_len, HashTable *options, HashTable *info, char **data,
-       size_t *data_len TSRMLS_DC)
-{
-       STATUS rs;
-       CURL *ch = curl_easy_init();
-
-       if (!ch) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-               return FAILURE;
-       }
-       rs = http_post_data_ex(ch, URL, postdata, postdata_len, options, info, data, data_len);
-       curl_easy_cleanup(ch);
-       return rs;
-}
-/* }}} */
-
 /* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
 PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata,
        size_t postdata_len, HashTable *options, HashTable *info, char **data,
        size_t *data_len TSRMLS_DC)
 {
-       http_curl_initbuf();
-       http_curl_setopts(ch, URL, options);
+       zend_bool clean_curl = 0;
+       
+       http_curl_startup(ch, clean_curl, URL, options);
        curl_easy_setopt(ch, CURLOPT_POST, 1);
        curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata);
        curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
 
        if (CURLE_OK != curl_easy_perform(ch)) {
-               http_curl_freebuf();
-               http_curl_freestr();
+               http_curl_cleanup(ch, clean_curl);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
                return FAILURE;
        }
+       
        if (info) {
                http_curl_getinfo(ch, info);
        }
-       http_curl_movebuf(data, data_len);
-       http_curl_freestr();
+       
+       http_curl_copybuf(data, data_len);
+       http_curl_cleanup(ch, clean_curl);
+       
        return SUCCESS;
 }
 /* }}} */
@@ -665,11 +601,7 @@ PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *po
        smart_str_0(&qstr);
        HTTP_URL_ARGSEP_RESTORE;
 
-       if (ch) {
-               status = http_post_data_ex(ch, URL, qstr.c, qstr.len, options, info, data, data_len);
-       } else {
-               status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len);
-       }
+       status = http_post_data_ex(ch, URL, qstr.c, qstr.len, options, info, data, data_len);
 
        if (qstr.c) {
                efree(qstr.c);
@@ -683,23 +615,27 @@ PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL,
        struct curl_httppost *curldata, HashTable *options, HashTable *info,
        char **data, size_t *data_len TSRMLS_DC)
 {
-       http_curl_initbuf();
-       http_curl_setopts(ch, URL, options);
+       zend_bool clean_curl = 0;
+       
+       http_curl_startup(ch, clean_curl, URL, options);
        curl_easy_setopt(ch, CURLOPT_POST, 1);
        curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata);
 
        if (CURLE_OK != curl_easy_perform(ch)) {
-               http_curl_freebuf();
-               http_curl_freestr();
+               http_curl_cleanup(ch, clean_curl);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
                return FAILURE;
        }
+       
        if (info) {
                http_curl_getinfo(ch, info);
        }
-       http_curl_movebuf(data, data_len);
-       http_curl_freestr();
-       return SUCCESS;}
+       
+       http_curl_copybuf(data, data_len);
+       http_curl_cleanup(ch, clean_curl);
+       
+       return SUCCESS;
+}
 /* }}} */
 
 /*

diff --git a/php_http_curl_api.h b/php_http_curl_api.h
index b67de515d092607731179451e588adb63152d8a2..085509e1ef7ee44bb50fd3daa8309da2d2a3022b 100644 (file)
--- a/php_http_curl_api.h
+++ b/php_http_curl_api.h
@@ -28,18 +28,15 @@
 /* CURL buffer size */
 #define HTTP_CURLBUF_SIZE 16384
 
-#define http_get(u, o, i, d, l) _http_get((u), (o), (i), (d), (l) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
+#define http_get(u, o, i, d, l) _http_get_ex(NULL, (u), (o), (i), (d), (l) TSRMLS_CC)
 #define http_get_ex(c, u, o, i, d, l) _http_get_ex((c), (u), (o), (i), (d), (l) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
 
-#define http_head(u, o, i, d, l) _http_head((u), (o), (i), (d), (l) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
+#define http_head(u, o, i, d, l) _http_head_ex(NULL, (u), (o), (i), (d), (l) TSRMLS_CC)
 #define http_head_ex(c, u, o, i, d, l) _http_head_ex((c), (u), (o), (i), (d), (l) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
 
-#define http_post_data(u, pd, pl, o, i, d, l) _http_post_data((u), (pd), (pl), (o), (i), (d), (l) TSRMLS_CC)
-PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata, size_t postdata_len, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
+#define http_post_data(u, pd, pl, o, i, d, l) _http_post_data_ex(NULL, (u), (pd), (pl), (o), (i), (d), (l) TSRMLS_CC)
 #define http_post_data_ex(c, u, pd, pl, o, i, d, l) _http_post_data_ex((c), (u), (pd), (pl), (o), (i), (d), (l) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata, size_t postdata_len, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
 
@@ -47,6 +44,7 @@ PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata
 #define http_post_array_ex(c, u, p, o, i, d, l) _http_post_array_ex((c), (u), (p), (o), (i), (d), (l) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *postarray, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
 
+#define http_post_curldata(u, h, o, i, d, l) _http_post_curldata_ex(NULL, (u), (h), (o), (i), (d), (l) TSRMLS_CC)
 #define http_post_curldata_ex(c, u, h, o, i, d, l) _http_post_curldata_ex((c), (u), (h), (o), (i), (d), (l) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, struct curl_httppost *curldata, HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC);
 
@@ -59,4 +57,4 @@ PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, struct cur
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
- */
+ */
\ No newline at end of file