* split into more reasonable modules
[m6w6/ext-http] / http_api.c
index 36211805e9781c3937997b0609301ce4c0cc1bcd..bee02cc01ff592551d911c0ee11bd5b6d006b1a2 100644 (file)
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#define _WINSOCKAPI_
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
 #include "php_http.h"
 #include "php_http_api.h"
 
-#ifdef HTTP_HAVE_CURL
-
-#      ifdef PHP_WIN32
-#              include <winsock2.h>
-#              include <sys/types.h>
-#      endif
-
-#      include <curl/curl.h>
-#      include <curl/easy.h>
-
-#endif
-
-
 ZEND_DECLARE_MODULE_GLOBALS(http)
 
 /* {{{ day/month names */
@@ -133,10 +121,6 @@ static const struct time_zone {
 /* {{{ internals */
 
 static int http_sort_q(const void *a, const void *b TSRMLS_DC);
-#define http_etag(e, p, l, m) _http_etag((e), (p), (l), (m) TSRMLS_CC)
-static inline char *_http_etag(char **new_etag, const void *data_ptr, const size_t data_len, const http_send_mode data_mode TSRMLS_DC);
-#define http_is_range_request() _http_is_range_request(TSRMLS_C)
-static inline int _http_is_range_request(TSRMLS_D);
 #define http_send_chunk(d, b, e, m) _http_send_chunk((d), (b), (e), (m) TSRMLS_CC)
 static STATUS _http_send_chunk(const void *data, const size_t begin, const size_t end, const http_send_mode mode TSRMLS_DC);
 
@@ -144,40 +128,8 @@ static int check_day(char *day, size_t len);
 static int check_month(char *month);
 static int check_tzone(char *tzone);
 
-static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen);
-
-/* {{{ HAVE_CURL */
-#ifdef HTTP_HAVE_CURL
-#define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
-static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC);
-#define http_curl_freebuf(m) _http_curl_freebuf((m) TSRMLS_CC)
-static inline void _http_curl_freebuf(http_curlbuf_member member TSRMLS_DC);
-#define http_curl_sizebuf(m, l) _http_curl_sizebuf((m), (l) TSRMLS_CC)
-static inline void _http_curl_sizebuf(http_curlbuf_member member, size_t len TSRMLS_DC);
-#define http_curl_movebuf(m, d, l) _http_curl_movebuf((m), (d), (l) TSRMLS_CC)
-static inline void _http_curl_movebuf(http_curlbuf_member member, char **data, size_t *data_len TSRMLS_DC);
-#define http_curl_copybuf(m, d, l) _http_curl_copybuf((m), (d), (l) TSRMLS_CC)
-static inline void _http_curl_copybuf(http_curlbuf_member member, 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);
-
-#define http_curl_getopt(o, k) _http_curl_getopt((o), (k) TSRMLS_CC, 0)
-#define http_curl_getopt1(o, k, t1) _http_curl_getopt((o), (k) TSRMLS_CC, 1, (t1))
-#define http_curl_getopt2(o, k, t1, t2) _http_curl_getopt((o), (k) TSRMLS_CC, 2, (t1), (t2))
-static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...);
-
-static size_t http_curl_body_callback(char *, size_t, size_t, void *);
-static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *);
-
-#define http_curl_getinfo(c, h) _http_curl_getinfo((c), (h) TSRMLS_CC)
-static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC);
-#define http_curl_getinfo_ex(c, i, a) _http_curl_getinfo_ex((c), (i), (a) TSRMLS_CC)
-static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC);
-#define http_curl_getinfoname(i) _http_curl_getinfoname((i) TSRMLS_CC)
-static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC);
 
-#endif
-/* }}} HAVE_CURL */
+static int http_ob_stack_get(php_ob_buffer *, php_ob_buffer **);
 
 /* {{{ static int http_sort_q(const void *, const void *) */
 static int http_sort_q(const void *a, const void *b TSRMLS_DC)
@@ -198,50 +150,6 @@ static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ static inline char *http_etag(char **, void *, size_t, http_send_mode) */
-static inline char *_http_etag(char **new_etag, const void *data_ptr,
-       const size_t data_len, const http_send_mode data_mode TSRMLS_DC)
-{
-       char ssb_buf[127], digest[16];
-       PHP_MD5_CTX ctx;
-
-       PHP_MD5Init(&ctx);
-
-       switch (data_mode)
-       {
-               case SEND_DATA:
-                       PHP_MD5Update(&ctx, data_ptr, data_len);
-               break;
-
-               case SEND_RSRC:
-                       snprintf(ssb_buf, 127, "%l=%l=%l",
-                               HTTP_G(ssb).sb.st_mtime,
-                               HTTP_G(ssb).sb.st_ino,
-                               HTTP_G(ssb).sb.st_size
-                       );
-                       PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
-               break;
-
-               default:
-                       return NULL;
-               break;
-       }
-
-       PHP_MD5Final(digest, &ctx);
-       make_digest(*new_etag, digest);
-
-       return *new_etag;
-}
-/* }}} */
-
-/* {{{ static inline int http_is_range_request(void) */
-static 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);
-}
-/* }}} */
-
 /* {{{ static STATUS http_send_chunk(const void *, size_t, size_t,
        http_send_mode) */
 static STATUS _http_send_chunk(const void *data, const size_t begin,
@@ -289,8 +197,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
                break;
 
                case SEND_DATA:
-                       return len == php_body_write(
-                               Z_STRVAL_P((zval *) data) + begin, len TSRMLS_CC)
+                       return len == php_body_write(((char *)data) + begin, len TSRMLS_CC)
                                ? SUCCESS : FAILURE;
                break;
 
@@ -301,470 +208,6 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 }
 /* }}} */
 
-/* {{{ HAVE_CURL */
-#ifdef HTTP_HAVE_CURL
-
-/* {{{ static inline void http_curl_initbuf(http_curlbuf_member) */
-static inline void _http_curl_initbuf(http_curlbuf_member member TSRMLS_DC)
-{
-       http_curl_freebuf(member);
-
-       if (member & CURLBUF_HDRS) {
-               HTTP_G(curlbuf).hdrs.data = emalloc(HTTP_CURLBUF_HDRSSIZE);
-               HTTP_G(curlbuf).hdrs.free = HTTP_CURLBUF_HDRSSIZE;
-       }
-       if (member & CURLBUF_BODY) {
-               HTTP_G(curlbuf).body.data = emalloc(HTTP_CURLBUF_BODYSIZE);
-               HTTP_G(curlbuf).body.free = HTTP_CURLBUF_BODYSIZE;
-       }
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_freebuf(http_curlbuf_member) */
-static inline void _http_curl_freebuf(http_curlbuf_member member TSRMLS_DC)
-{
-       if (member & CURLBUF_HDRS) {
-               if (HTTP_G(curlbuf).hdrs.data) {
-                       efree(HTTP_G(curlbuf).hdrs.data);
-                       HTTP_G(curlbuf).hdrs.data = NULL;
-               }
-               HTTP_G(curlbuf).hdrs.used = 0;
-               HTTP_G(curlbuf).hdrs.free = 0;
-       }
-       if (member & CURLBUF_BODY) {
-               if (HTTP_G(curlbuf).body.data) {
-                       efree(HTTP_G(curlbuf).body.data);
-                       HTTP_G(curlbuf).body.data = NULL;
-               }
-               HTTP_G(curlbuf).body.used = 0;
-               HTTP_G(curlbuf).body.free = 0;
-       }
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_copybuf(http_curlbuf_member, char **,
-       size_t *) */
-static inline void _http_curl_copybuf(http_curlbuf_member member, char **data,
-       size_t *data_len TSRMLS_DC)
-{
-       *data = NULL;
-       *data_len = 0;
-
-       if ((member & CURLBUF_HDRS) && HTTP_G(curlbuf).hdrs.used) {
-               if ((member & CURLBUF_BODY) && HTTP_G(curlbuf).body.used) {
-                       *data = emalloc(HTTP_G(curlbuf).hdrs.used + HTTP_G(curlbuf).body.used + 1);
-               } else {
-                       *data = emalloc(HTTP_G(curlbuf).hdrs.used + 1);
-               }
-               memcpy(*data, HTTP_G(curlbuf).hdrs.data, HTTP_G(curlbuf).hdrs.used);
-               *data_len = HTTP_G(curlbuf).hdrs.used;
-       }
-
-       if ((member & CURLBUF_BODY) && HTTP_G(curlbuf).body.used) {
-               if (*data) {
-                       memcpy((*data) + HTTP_G(curlbuf).hdrs.used,
-                               HTTP_G(curlbuf).body.data, HTTP_G(curlbuf).body.used);
-                       *data_len = HTTP_G(curlbuf).hdrs.used + HTTP_G(curlbuf).body.used;
-               } else {
-                       emalloc(HTTP_G(curlbuf).body.used + 1);
-                       memcpy(*data, HTTP_G(curlbuf).body.data, HTTP_G(curlbuf).body.used);
-                       *data_len = HTTP_G(curlbuf).body.used;
-               }
-       }
-       if (*data) {
-               (*data)[*data_len] = 0;
-       } else {
-               *data = "";
-       }
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_movebuf(http_curlbuf_member, char **,
-       size_t *) */
-static inline void _http_curl_movebuf(http_curlbuf_member member, char **data,
-       size_t *data_len TSRMLS_DC)
-{
-       http_curl_copybuf(member, data, data_len);
-       http_curl_freebuf(member);
-}
-/* }}} */
-
-/* {{{ 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)
-{
-       TSRMLS_FETCH();
-
-       if ((len *= n) > HTTP_G(curlbuf).body.free) {
-               size_t bsize = HTTP_CURLBUF_BODYSIZE;
-               while (bsize < len) {
-                       bsize *= 2;
-               }
-               HTTP_G(curlbuf).body.data = erealloc(HTTP_G(curlbuf).body.data,
-                       HTTP_G(curlbuf).body.used + bsize);
-               HTTP_G(curlbuf).body.free += bsize;
-       }
-
-       memcpy(HTTP_G(curlbuf).body.data + HTTP_G(curlbuf).body.used, buf, len);
-       HTTP_G(curlbuf).body.free -= len;
-       HTTP_G(curlbuf).body.used += len;
-
-       return len;
-}
-/* }}} */
-
-/* {{{ static size_t http_curl_hdrs_callback(char*, size_t, size_t, void *) */
-static size_t http_curl_hdrs_callback(char *buf, size_t len, size_t n, void *s)
-{
-       TSRMLS_FETCH();
-
-       /* discard previous headers */
-       if ((HTTP_G(curlbuf).hdrs.used) && (!strncmp(buf, "HTTP/1.", strlen("HTTP/1.")))) {
-               http_curl_initbuf(CURLBUF_HDRS);
-       }
-
-       if ((len *= n) > HTTP_G(curlbuf).hdrs.free) {
-               size_t bsize = HTTP_CURLBUF_HDRSSIZE;
-               while (bsize < len) {
-                       bsize *= 2;
-               }
-               HTTP_G(curlbuf).hdrs.data = erealloc(HTTP_G(curlbuf).hdrs.data,
-                       HTTP_G(curlbuf).hdrs.used + bsize);
-               HTTP_G(curlbuf).hdrs.free += bsize;
-       }
-
-       memcpy(HTTP_G(curlbuf).hdrs.data + HTTP_G(curlbuf).hdrs.used, buf, len);
-       HTTP_G(curlbuf).hdrs.free -= len;
-       HTTP_G(curlbuf).hdrs.used += len;
-
-       return len;
-}
-/* }}} */
-
-/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, int, ...) */
-static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...)
-{
-       zval **zoption;
-       va_list types;
-       int i;
-
-       if (SUCCESS != zend_hash_find(options, key, strlen(key) + 1, (void **) &zoption)) {
-               return NULL;
-       }
-       if (checks < 1) {
-               return *zoption;
-       }
-
-       va_start(types, checks);
-       for (i = 0; i < checks; ++i) {
-               if ((va_arg(types, int)) == (Z_TYPE_PP(zoption))) {
-                       va_end(types);
-                       return *zoption;
-               }
-       }
-       va_end(types);
-       return NULL;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_setopts(CURL *, char *, HashTable *) */
-static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC)
-{
-       zval *zoption;
-
-       /* standard options */
-       curl_easy_setopt(ch, CURLOPT_URL, url);
-       curl_easy_setopt(ch, CURLOPT_HEADER, 0);
-       curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1);
-       curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1);
-       curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback);
-       curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback);
-#ifdef ZTS
-       curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
-#endif
-
-       if ((!options) || (1 > zend_hash_num_elements(options))) {
-               return;
-       }
-
-       /* redirects, defaults to 0 */
-       if (zoption = http_curl_getopt1(options, "redirect", IS_LONG)) {
-               curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0);
-               curl_easy_setopt(ch, CURLOPT_MAXREDIRS, Z_LVAL_P(zoption));
-               if (zoption = http_curl_getopt2(options, "unrestrictedauth", IS_LONG, IS_BOOL)) {
-                       curl_easy_setopt(ch, CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
-               }
-       } else {
-               curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0);
-       }
-
-       /* proxy */
-       if (zoption = http_curl_getopt1(options, "proxyhost", IS_STRING)) {
-               curl_easy_setopt(ch, CURLOPT_PROXY, Z_STRVAL_P(zoption));
-               /* port */
-               if (zoption = http_curl_getopt1(options, "proxyport", IS_LONG)) {
-                       curl_easy_setopt(ch, CURLOPT_PROXYPORT, Z_LVAL_P(zoption));
-               }
-               /* user:pass */
-               if (zoption = http_curl_getopt1(options, "proxyauth", IS_STRING)) {
-                       curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, Z_STRVAL_P(zoption));
-               }
-               /* auth method */
-               if (zoption = http_curl_getopt1(options, "proxyauthtype", IS_LONG)) {
-                       curl_easy_setopt(ch, CURLOPT_PROXYAUTH, Z_LVAL_P(zoption));
-               }
-       }
-
-       /* auth */
-       if (zoption = http_curl_getopt1(options, "httpauth", IS_STRING)) {
-               curl_easy_setopt(ch, CURLOPT_USERPWD, Z_STRVAL_P(zoption));
-       }
-       if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) {
-               curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption));
-       }
-
-       /* compress, enabled by default (empty string enables deflate and gzip) */
-       if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) {
-               if (Z_LVAL_P(zoption)) {
-                       curl_easy_setopt(ch, CURLOPT_ENCODING, "");
-               }
-       } else {
-               curl_easy_setopt(ch, CURLOPT_ENCODING, "");
-       }
-
-       /* another port */
-       if (zoption = http_curl_getopt1(options, "port", IS_LONG)) {
-               curl_easy_setopt(ch, CURLOPT_PORT, Z_LVAL_P(zoption));
-       }
-
-       /* referer */
-       if (zoption = http_curl_getopt1(options, "referer", IS_STRING)) {
-               curl_easy_setopt(ch, CURLOPT_REFERER, Z_STRVAL_P(zoption));
-       }
-
-       /* useragent, default "PECL::HTTP/version (PHP/version)" */
-       if (zoption = http_curl_getopt1(options, "useragent", IS_STRING)) {
-               curl_easy_setopt(ch, CURLOPT_USERAGENT, Z_STRVAL_P(zoption));
-       } else {
-               curl_easy_setopt(ch, CURLOPT_USERAGENT,
-                       "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
-       }
-
-       /* cookies, array('name' => 'value') */
-       if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) {
-               char *cookie_key;
-               zval **cookie_val;
-               int key_type;
-               smart_str qstr = {0};
-
-               zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
-               while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
-                       if (key_type == HASH_KEY_IS_STRING) {
-                               zend_hash_get_current_key(Z_ARRVAL_P(zoption), &cookie_key, NULL, 0);
-                               zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val);
-                               smart_str_appends(&qstr, cookie_key);
-                               smart_str_appendl(&qstr, "=", 1);
-                               smart_str_appendl(&qstr, Z_STRVAL_PP(cookie_val), Z_STRLEN_PP(cookie_val));
-                               smart_str_appendl(&qstr, "; ", 2);
-                               zend_hash_move_forward(Z_ARRVAL_P(zoption));
-                       }
-               }
-               smart_str_0(&qstr);
-
-               if (qstr.c) {
-                       curl_easy_setopt(ch, CURLOPT_COOKIE, qstr.c);
-               }
-       }
-
-       /* cookiestore */
-       if (zoption = http_curl_getopt1(options, "cookiestore", IS_STRING)) {
-               curl_easy_setopt(ch, CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption));
-               curl_easy_setopt(ch, CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption));
-       }
-
-       /* additional headers, array('name' => 'value') */
-       if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) {
-               int key_type;
-               char *header_key, header[1024] = {0};
-               zval **header_val;
-               struct curl_slist *headers = NULL;
-
-               zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption));
-               while (HASH_KEY_NON_EXISTANT != (key_type = zend_hash_get_current_key_type(Z_ARRVAL_P(zoption)))) {
-                       if (key_type == HASH_KEY_IS_STRING) {
-                               zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0);
-                               zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val);
-                               snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
-                               headers = curl_slist_append(headers, header);
-                               zend_hash_move_forward(Z_ARRVAL_P(zoption));
-                       }
-               }
-               if (headers) {
-                       curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers);
-               }
-       }
-}
-/* }}} */
-
-/* {{{ static inline char *http_curl_getinfoname(CURLINFO) */
-static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC)
-{
-#define CASE(I) case CURLINFO_ ##I : return pretty_key(estrdup( #I ), strlen(#I), 0, 0)
-       switch (i)
-       {
-               /* CURLINFO_EFFECTIVE_URL                       =       CURLINFO_STRING +1, */
-               CASE(EFFECTIVE_URL);
-               /* CURLINFO_RESPONSE_CODE                       =       CURLINFO_LONG   +2, */
-               CASE(RESPONSE_CODE);
-               /* CURLINFO_TOTAL_TIME                          =       CURLINFO_DOUBLE +3, */
-               CASE(TOTAL_TIME);
-               /* CURLINFO_NAMELOOKUP_TIME                     =       CURLINFO_DOUBLE +4, */
-               CASE(NAMELOOKUP_TIME);
-               /* CURLINFO_CONNECT_TIME                        =       CURLINFO_DOUBLE +5, */
-               CASE(CONNECT_TIME);
-               /* CURLINFO_PRETRANSFER_TIME            =       CURLINFO_DOUBLE +6, */
-               CASE(PRETRANSFER_TIME);
-               /* CURLINFO_SIZE_UPLOAD                         =       CURLINFO_DOUBLE +7, */
-               CASE(SIZE_UPLOAD);
-               /* CURLINFO_SIZE_DOWNLOAD                       =       CURLINFO_DOUBLE +8, */
-               CASE(SIZE_DOWNLOAD);
-               /* CURLINFO_SPEED_DOWNLOAD                      =       CURLINFO_DOUBLE +9, */
-               CASE(SPEED_DOWNLOAD);
-               /* CURLINFO_SPEED_UPLOAD                        =       CURLINFO_DOUBLE +10, */
-               CASE(SPEED_UPLOAD);
-               /* CURLINFO_HEADER_SIZE                         =       CURLINFO_LONG   +11, */
-               CASE(HEADER_SIZE);
-               /* CURLINFO_REQUEST_SIZE                        =       CURLINFO_LONG   +12, */
-               CASE(REQUEST_SIZE);
-               /* CURLINFO_SSL_VERIFYRESULT            =       CURLINFO_LONG   +13, */
-               CASE(SSL_VERIFYRESULT);
-               /* CURLINFO_FILETIME                            =       CURLINFO_LONG   +14, */
-               CASE(FILETIME);
-               /* CURLINFO_CONTENT_LENGTH_DOWNLOAD     =       CURLINFO_DOUBLE +15, */
-               CASE(CONTENT_LENGTH_DOWNLOAD);
-               /* CURLINFO_CONTENT_LENGTH_UPLOAD       =       CURLINFO_DOUBLE +16, */
-               CASE(CONTENT_LENGTH_UPLOAD);
-               /* CURLINFO_STARTTRANSFER_TIME          =       CURLINFO_DOUBLE +17, */
-               CASE(STARTTRANSFER_TIME);
-               /* CURLINFO_CONTENT_TYPE                        =       CURLINFO_STRING +18, */
-               CASE(CONTENT_TYPE);
-               /* CURLINFO_REDIRECT_TIME                       =       CURLINFO_DOUBLE +19, */
-               CASE(REDIRECT_TIME);
-               /* CURLINFO_REDIRECT_COUNT                      =       CURLINFO_LONG   +20, */
-               CASE(REDIRECT_COUNT);
-               /* CURLINFO_PRIVATE                                     =       CURLINFO_STRING +21, */
-               CASE(PRIVATE);
-               /* CURLINFO_HTTP_CONNECTCODE            =       CURLINFO_LONG   +22, */
-               CASE(HTTP_CONNECTCODE);
-               /* CURLINFO_HTTPAUTH_AVAIL                      =       CURLINFO_LONG   +23, */
-               CASE(HTTPAUTH_AVAIL);
-               /* CURLINFO_PROXYAUTH_AVAIL                     =       CURLINFO_LONG   +24, */
-               CASE(PROXYAUTH_AVAIL);
-       }
-#undef CASE
-       return NULL;
-}
-/* }}} */
-
-/* {{{ static inline void http_curl_getinfo_ex(CURL, CURLINFO, zval *) */
-static inline void _http_curl_getinfo_ex(CURL *ch, CURLINFO i, zval *array TSRMLS_DC)
-{
-       char *key;
-       if (key = http_curl_getinfoname(i)) {
-               switch (i & ~CURLINFO_MASK)
-               {
-                       case CURLINFO_STRING:
-                       {
-                               char *c;
-                               if (CURLE_OK == curl_easy_getinfo(ch, i, &c)) {
-                                       add_assoc_string(array, key, c ? c : "", 1);
-                               }
-                       }
-                       break;
-
-                       case CURLINFO_DOUBLE:
-                       {
-                               double d;
-                               if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) {
-                                       add_assoc_double(array, key, d);
-                               }
-                       }
-                       break;
-
-                       case CURLINFO_LONG:
-                       {
-                               long l;
-                               if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) {
-                                       add_assoc_long(array, key, l);
-                               }
-                       }
-                       break;
-               }
-       }
-}
-/* }}} */
-
-/* {{{ static inline http_curl_getinfo(CURL, HashTable *) */
-static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
-{
-       zval array;
-       Z_ARRVAL(array) = info;
-
-#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , &array)
-       /* CURLINFO_EFFECTIVE_URL                       =       CURLINFO_STRING +1, */
-       INFO(EFFECTIVE_URL);
-       /* CURLINFO_RESPONSE_CODE                       =       CURLINFO_LONG   +2, */
-       INFO(RESPONSE_CODE);
-       /* CURLINFO_TOTAL_TIME                          =       CURLINFO_DOUBLE +3, */
-       INFO(TOTAL_TIME);
-       /* CURLINFO_NAMELOOKUP_TIME                     =       CURLINFO_DOUBLE +4, */
-       INFO(NAMELOOKUP_TIME);
-       /* CURLINFO_CONNECT_TIME                        =       CURLINFO_DOUBLE +5, */
-       INFO(CONNECT_TIME);
-       /* CURLINFO_PRETRANSFER_TIME            =       CURLINFO_DOUBLE +6, */
-       INFO(PRETRANSFER_TIME);
-       /* CURLINFO_SIZE_UPLOAD                         =       CURLINFO_DOUBLE +7, */
-       INFO(SIZE_UPLOAD);
-       /* CURLINFO_SIZE_DOWNLOAD                       =       CURLINFO_DOUBLE +8, */
-       INFO(SIZE_DOWNLOAD);
-       /* CURLINFO_SPEED_DOWNLOAD                      =       CURLINFO_DOUBLE +9, */
-       INFO(SPEED_DOWNLOAD);
-       /* CURLINFO_SPEED_UPLOAD                        =       CURLINFO_DOUBLE +10, */
-       INFO(SPEED_UPLOAD);
-       /* CURLINFO_HEADER_SIZE                         =       CURLINFO_LONG   +11, */
-       INFO(HEADER_SIZE);
-       /* CURLINFO_REQUEST_SIZE                        =       CURLINFO_LONG   +12, */
-       INFO(REQUEST_SIZE);
-       /* CURLINFO_SSL_VERIFYRESULT            =       CURLINFO_LONG   +13, */
-       INFO(SSL_VERIFYRESULT);
-       /* CURLINFO_FILETIME                            =       CURLINFO_LONG   +14, */
-       INFO(FILETIME);
-       /* CURLINFO_CONTENT_LENGTH_DOWNLOAD     =       CURLINFO_DOUBLE +15, */
-       INFO(CONTENT_LENGTH_DOWNLOAD);
-       /* CURLINFO_CONTENT_LENGTH_UPLOAD       =       CURLINFO_DOUBLE +16, */
-       INFO(CONTENT_LENGTH_UPLOAD);
-       /* CURLINFO_STARTTRANSFER_TIME          =       CURLINFO_DOUBLE +17, */
-       INFO(STARTTRANSFER_TIME);
-       /* CURLINFO_CONTENT_TYPE                        =       CURLINFO_STRING +18, */
-       INFO(CONTENT_TYPE);
-       /* CURLINFO_REDIRECT_TIME                       =       CURLINFO_DOUBLE +19, */
-       INFO(REDIRECT_TIME);
-       /* CURLINFO_REDIRECT_COUNT                      =       CURLINFO_LONG   +20, */
-       INFO(REDIRECT_COUNT);
-       /* CURLINFO_PRIVATE                                     =       CURLINFO_STRING +21, */
-       INFO(PRIVATE);
-       /* CURLINFO_HTTP_CONNECTCODE            =       CURLINFO_LONG   +22, */
-       INFO(HTTP_CONNECTCODE);
-       /* CURLINFO_HTTPAUTH_AVAIL                      =       CURLINFO_LONG   +23, */
-       INFO(HTTPAUTH_AVAIL);
-       /* CURLINFO_PROXYAUTH_AVAIL                     =       CURLINFO_LONG   +24, */
-       INFO(PROXYAUTH_AVAIL);
-#undef INFO
-}
-/* }}} */
-
-#endif
-/* }}} HAVE_CURL */
-
 /* {{{ Day/Month/TZ checks for http_parse_date()
        Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al. */
 static int check_day(char *day, size_t len)
@@ -810,8 +253,8 @@ static int check_tzone(char *tzone)
 }
 /* }}} */
 
-/* static char *pretty_key(char *, int, int, int) */
-static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
+/* char *pretty_key(char *, int, int, int) */
+char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
 {
        if (key && key_len) {
                int i, wasalpha;
@@ -834,6 +277,21 @@ static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
 }
 /* }}} */
 
+/* {{{ static STATUS http_ob_stack_get(php_ob_buffer *, php_ob_buffer **) */
+static STATUS http_ob_stack_get(php_ob_buffer *o, php_ob_buffer **s)
+{
+       static int i = 0;
+       php_ob_buffer *b = emalloc(sizeof(php_ob_buffer));
+       b->handler_name = estrdup(o->handler_name);
+       b->buffer = estrndup(o->buffer, o->text_length);
+       b->text_length = o->text_length;
+       b->chunk_size = o->chunk_size;
+       b->erase = o->erase;
+       s[i++] = b;
+       return SUCCESS;
+}
+/* }}} */
+
 /* }}} internals */
 
 /* {{{ public API */
@@ -842,7 +300,7 @@ static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen)
 PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC)
 {
        struct tm *gmtime, tmbuf;
-       char *date = ecalloc(31, 1);
+       char *date = ecalloc(1, 31);
 
        gmtime = php_gmtime_r(&t, &tmbuf);
        snprintf(date, 30,
@@ -1025,6 +483,91 @@ PHP_HTTP_API time_t _http_parse_date(const char *date)
 }
 /* }}} */
 
+/* {{{ inline char *http_etag(void *, size_t, http_send_mode) */
+PHP_HTTP_API inline char *_http_etag(const void *data_ptr, const size_t data_len,
+       const http_send_mode data_mode TSRMLS_DC)
+{
+       char ssb_buf[128] = {0};
+       unsigned char digest[16];
+       PHP_MD5_CTX ctx;
+       char *new_etag = ecalloc(1, 33);
+
+       PHP_MD5Init(&ctx);
+
+       switch (data_mode)
+       {
+               case SEND_DATA:
+                       PHP_MD5Update(&ctx, data_ptr, data_len);
+               break;
+
+               case SEND_RSRC:
+                       if (!HTTP_G(ssb).sb.st_ino) {
+                               if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
+                                       return NULL;
+                               }
+                       }
+                       snprintf(ssb_buf, 127, "%ld=%ld=%ld",
+                               HTTP_G(ssb).sb.st_mtime,
+                               HTTP_G(ssb).sb.st_ino,
+                               HTTP_G(ssb).sb.st_size
+                       );
+                       PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+               break;
+
+               default:
+                       efree(new_etag);
+                       return NULL;
+               break;
+       }
+
+       PHP_MD5Final(digest, &ctx);
+       make_digest(new_etag, digest);
+
+       return new_etag;
+}
+/* }}} */
+
+/* {{{ inline http_lmod(void *, http_send_mode) */
+PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode data_mode TSRMLS_DC)
+{
+       switch (data_mode)
+       {
+               case SEND_DATA:
+               {
+                       return time(NULL);
+               }
+
+               case SEND_RSRC:
+               {
+                       if (!HTTP_G(ssb).sb.st_mtime) {
+                               if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
+                                       return 0;
+                               }
+                       }
+                       return HTTP_G(ssb).sb.st_mtime;
+               }
+
+               default:
+               {
+                       if (!HTTP_G(ssb).sb.st_mtime) {
+                               if(php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb))) {
+                                       return 0;
+                               }
+                       }
+                       return HTTP_G(ssb).sb.st_mtime;
+               }
+       }
+}
+/* }}} */
+
+/* {{{inline int http_is_range_request(void) */
+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);
+}
+/* }}} */
+
 /* {{{ inline STATUS http_send_status(int) */
 PHP_HTTP_API inline STATUS _http_send_status(const int status TSRMLS_DC)
 {
@@ -1094,6 +637,50 @@ PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
 }
 /* }}} */
 
+/* {{{ STATUS http_start_ob_handler(php_output_handler_func_t, char *, uint, zend_bool) */
+PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_func,
+       char *handler_name, uint chunk_size, zend_bool erase TSRMLS_DC)
+{
+       php_ob_buffer **stack;
+       int count, i;
+
+       if (count = OG(ob_nesting_level)) {
+               stack = ecalloc(count, sizeof(php_ob_buffer *));
+
+               if (count > 1) {
+                       zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP,
+                               (int (*)(void *elem, void *)) http_ob_stack_get, stack);
+               }
+
+               if (count > 0) {
+                       http_ob_stack_get(&OG(active_ob_buffer), stack);
+               }
+
+               while (OG(ob_nesting_level)) {
+                       php_end_ob_buffer(0, 0 TSRMLS_CC);
+               }
+       }
+
+       php_ob_set_internal_handler(handler_func, chunk_size, handler_name, erase TSRMLS_CC);
+
+       for (i = 0; i < count; i++) {
+               php_ob_buffer *s = stack[i];
+               if (strcmp(s->handler_name, "default output handler")) {
+                       php_start_ob_buffer_named(s->handler_name, s->chunk_size, s->erase TSRMLS_CC);
+               }
+               php_body_write(s->buffer, s->text_length TSRMLS_CC);
+               efree(s->handler_name);
+               efree(s->buffer);
+               efree(s);
+       }
+       if (count) {
+               efree(stack);
+       }
+
+       return SUCCESS;
+}
+/* }}} */
+
 /* {{{ int http_modified_match(char *, int) */
 PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_DC)
 {
@@ -1158,15 +745,14 @@ PHP_HTTP_API STATUS _http_send_last_modified(const time_t t TSRMLS_DC)
 PHP_HTTP_API STATUS _http_send_etag(const char *etag,
        const int etag_len TSRMLS_DC)
 {
-       STATUS ret;
-       int header_len;
+       STATUS status;
        char *etag_header;
 
-       header_len = sizeof("ETag: \"\"") + etag_len + 1;
-       etag_header = ecalloc(header_len, 1);
-       sprintf(etag_header, "ETag: \"%s\"", etag);
-       ret = http_send_header(etag_header);
-       efree(etag_header);
+       if (!etag_len){
+               php_error_docref(NULL TSRMLS_CC,E_ERROR,
+                       "Attempt to send empty ETag (previous: %s)\n", HTTP_G(etag));
+               return FAILURE;
+       }
 
        /* remember */
        if (HTTP_G(etag)) {
@@ -1174,7 +760,139 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag,
        }
        HTTP_G(etag) = estrdup(etag);
 
-       return ret;
+       etag_header = ecalloc(1, sizeof("ETag: \"\"") + etag_len);
+       sprintf(etag_header, "ETag: \"%s\"", etag);
+       if (SUCCESS != (status = http_send_header(etag_header))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", etag_header);
+       }
+       efree(etag_header);
+       return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_cache_control(char *, size_t) */
+PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control,
+       const size_t cc_len TSRMLS_DC)
+{
+       STATUS status;
+       char *cc_header = ecalloc(1, sizeof("Cache-Control: ") + cc_len);
+
+       sprintf(cc_header, "Cache-Control: %s", cache_control);
+       if (SUCCESS != (status = http_send_header(cc_header))) {
+               php_error_docref(NULL TSRMLS_CC, E_NOTICE,
+                       "Could not send '%s' header", cc_header);
+       }
+       efree(cc_header);
+       return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_content_type(char *, size_t) */
+PHP_HTTP_API STATUS _http_send_content_type(const char *content_type,
+       const size_t ct_len TSRMLS_DC)
+{
+       STATUS status;
+       char *ct_header;
+
+       if (!strchr(content_type, '/')) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                       "Content-Type '%s' doesn't seem to consist of a primary and a secondary part",
+                       content_type);
+               return FAILURE;
+       }
+
+       /* remember for multiple ranges */
+       if (HTTP_G(ctype)) {
+               efree(HTTP_G(ctype));
+       }
+       HTTP_G(ctype) = estrndup(content_type, ct_len);
+
+       ct_header = ecalloc(1, sizeof("Content-Type: ") + ct_len);
+       sprintf(ct_header, "Content-Type: %s", content_type);
+
+       if (SUCCESS != (status = http_send_header(ct_header))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                       "Couldn't send '%s' header", ct_header);
+       }
+       efree(ct_header);
+       return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_content_disposition(char *, size_t, zend_bool) */
+PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename,
+       const size_t f_len, const int send_inline TSRMLS_DC)
+{
+       STATUS status;
+       char *cd_header;
+
+       if (send_inline) {
+               cd_header = ecalloc(1, sizeof("Content-Disposition: inline; filename=\"\"") + f_len);
+               sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename);
+       } else {
+               cd_header = ecalloc(1, sizeof("Content-Disposition: attachment; filename=\"\"") + f_len);
+               sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename);
+       }
+
+       if (SUCCESS != (status = http_send_header(cd_header))) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", cd_header);
+       }
+       efree(cd_header);
+       return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_cache_last_modified(time_t, time_t, char *, size_t) */
+PHP_HTTP_API STATUS _http_cache_last_modified(const time_t last_modified,
+       const time_t send_modified, const char *cache_control, const size_t cc_len TSRMLS_DC)
+{
+       if (cc_len) {
+               http_send_cache_control(cache_control, cc_len);
+       }
+
+       if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) {
+               if (SUCCESS == http_send_status(304)) {
+                       zend_bailout();
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
+                       return FAILURE;
+               }
+       }
+       return http_send_last_modified(send_modified);
+}
+/* }}} */
+
+/* {{{ STATUS http_cache_etag(char *, size_t, char *, size_t) */
+PHP_HTTP_API STATUS _http_cache_etag(const char *etag, const size_t etag_len,
+       const char *cache_control, const size_t cc_len TSRMLS_DC)
+{
+       if (cc_len) {
+               http_send_cache_control(cache_control, cc_len);
+       }
+
+       if (etag_len) {
+               http_send_etag(etag, etag_len);
+               if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+                       if (SUCCESS == http_send_status(304)) {
+                               zend_bailout();
+                       } else {
+                               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
+                               return FAILURE;
+                       }
+               }
+       }
+
+       /* if no etag is given and we didn't already start ob_etaghandler -- start it */
+       if (!HTTP_G(etag_started)) {
+               if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) {
+                       HTTP_G(etag_started) = 1;
+                       return SUCCESS;
+               } else {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start ob_etaghandler");
+                       return FAILURE;
+               }
+       }
+       return SUCCESS;
 }
 /* }}} */
 
@@ -1182,7 +900,7 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag,
 PHP_HTTP_API char *_http_absolute_uri(const char *url,
        const char *proto TSRMLS_DC)
 {
-       char URI[HTTP_URI_MAXLEN + 1], *PTR, *proto_ptr, *host, *path;
+       char *proto_ptr, *host, *path, *PTR, *URI = ecalloc(1, HTTP_URI_MAXLEN + 1);
        zval *zhost;
 
        if (!url || !strlen(url)) {
@@ -1194,10 +912,11 @@ PHP_HTTP_API char *_http_absolute_uri(const char *url,
        /* Mess around with already absolute URIs */
        else if (proto_ptr = strstr(url, "://")) {
                if (!proto || !strncmp(url, proto, strlen(proto))) {
-                       return estrdup(url);
+                       strncpy(URI, url, HTTP_URI_MAXLEN);
+                       return URI;
                } else {
                        snprintf(URI, HTTP_URI_MAXLEN, "%s%s", proto, proto_ptr + 3);
-                       return estrdup(URI);
+                       return URI;
                }
        }
 
@@ -1228,16 +947,11 @@ PHP_HTTP_API char *_http_absolute_uri(const char *url,
        }
 
        /* strip everything after a new line */
-       PTR = URI;
-       while (*PTR != 0) {
-               if (*PTR == '\n' || *PTR == '\r') {
-                       *PTR = 0;
-                       break;
-               }
-               PTR++;
+       if ((PTR = strchr(URI, '\r')) || (PTR = strchr(URI, '\n'))) {
+               PTR = 0;
        }
 
-       return estrdup(URI);
+       return URI;
 }
 /* }}} */
 
@@ -1519,7 +1233,6 @@ PHP_HTTP_API STATUS _http_send_ranges(zval *zranges, const void *data, const siz
 PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
        const http_send_mode data_mode TSRMLS_DC)
 {
-       char *new_etag = NULL;
        int is_range_request = http_is_range_request();
 
        if (!data_ptr) {
@@ -1528,24 +1241,23 @@ PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
 
        /* etag handling */
        if (HTTP_G(etag_started)) {
-               new_etag = (char *) emalloc(33);
-
-               /* never ever use the output to compute the ETag if http_send() is used */
+               char *etag;
+               /* interrupt */
                HTTP_G(etag_started) = 0;
+               /* never ever use the output to compute the ETag if http_send() is used */
                php_end_ob_buffer(0, 0 TSRMLS_CC);
-               if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) {
-                       efree(new_etag);
+               if (!(etag = http_etag(data_ptr, data_size, data_mode))) {
                        return FAILURE;
                }
 
                /* send 304 Not Modified if etag matches */
-               if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
-                       efree(new_etag);
+               if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+                       efree(etag);
                        return http_send_status(304);
                }
 
-               http_send_etag(new_etag, 32);
-               efree(new_etag);
+               http_send_etag(etag, 32);
+               efree(etag);
        }
 
        /* send 304 Not Modified if last-modified matches*/
@@ -1612,7 +1324,7 @@ PHP_HTTP_API STATUS _http_send_data(const zval *zdata TSRMLS_DC)
                return FAILURE;
        }
 
-       return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA);
+       return http_send(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), SEND_DATA);
 }
 /* }}} */
 
@@ -1656,7 +1368,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
        char *d_ptr;
 
        *decoded_len = 0;
-       *decoded = (char *) ecalloc(encoded_len, 1);
+       *decoded = ecalloc(1, encoded_len);
        d_ptr = *decoded;
        e_ptr = encoded;
 
@@ -1712,15 +1424,14 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 }
 /* }}} */
 
-/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
-       zval *zbody TSRMLS_DC)
+/* {{{ proto STATUS http_split_response_ex(char *, size_t, zval *, zval *) */
+PHP_HTTP_API STATUS _http_split_response_ex( char *response,
+       size_t response_len, zval *zheaders, zval *zbody TSRMLS_DC)
 {
-       char *header, *response, *body = NULL;
-       long response_len = Z_STRLEN_P(zresponse);
-       header = response = Z_STRVAL_P(zresponse);
+       char *body = NULL;
+       char *header = response;
 
-       while ((response - Z_STRVAL_P(zresponse) + 3) < response_len) {
+       while ((response - header + 4) < response_len) {
                if (    (*response++ == '\r') &&
                                (*response++ == '\n') &&
                                (*response++ == '\r') &&
@@ -1736,7 +1447,7 @@ PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
                Z_TYPE_P(zbody) = IS_NULL;
        }
 
-       return http_parse_headers(header, body - Z_STRVAL_P(zresponse), zheaders);
+       return http_parse_headers(header, body ? body - header : response_len, zheaders);
 }
 /* }}} */
 
@@ -1823,134 +1534,6 @@ PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
 }
 /* }}} */
 
-/* {{{ HAVE_CURL */
-#ifdef HTTP_HAVE_CURL
-
-/* {{{ 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)
-{
-       CURL *ch = curl_easy_init();
-
-       if (!ch) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-               return FAILURE;
-       }
-
-       http_curl_initbuf(CURLBUF_EVRY);
-       http_curl_setopts(ch, URL, options);
-
-       if (CURLE_OK != curl_easy_perform(ch)) {
-               curl_easy_cleanup(ch);
-               http_curl_freebuf(CURLBUF_EVRY);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-               return FAILURE;
-       }
-       if (info) {
-               http_curl_getinfo(ch, info);
-       }
-       curl_easy_cleanup(ch);
-
-       http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
-       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)
-{
-       CURL *ch = curl_easy_init();
-
-       if (!ch) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-               return FAILURE;
-       }
-
-       http_curl_initbuf(CURLBUF_HDRS);
-       http_curl_setopts(ch, URL, options);
-       curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
-
-       if (CURLE_OK != curl_easy_perform(ch)) {
-               curl_easy_cleanup(ch);
-               http_curl_freebuf(CURLBUF_HDRS);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-               return FAILURE;
-       }
-       if (info) {
-               http_curl_getinfo(ch, info);
-       }
-       curl_easy_cleanup(ch);
-
-       http_curl_movebuf(CURLBUF_HDRS, data, data_len);
-
-       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)
-{
-       CURL *ch = curl_easy_init();
-
-       if (!ch) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
-               return FAILURE;
-       }
-
-       http_curl_initbuf(CURLBUF_EVRY);
-       http_curl_setopts(ch, 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)) {
-               curl_easy_cleanup(ch);
-               http_curl_freebuf(CURLBUF_EVRY);
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
-               return FAILURE;
-       }
-       if (info) {
-               http_curl_getinfo(ch, info);
-       }
-       curl_easy_cleanup(ch);
-
-       http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
-       return SUCCESS;
-}
-/* }}} */
-
-/* {{{ STATUS http_post_array(char *, HashTable *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray,
-       HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC)
-{
-       smart_str qstr = {0};
-       STATUS status;
-
-       if (php_url_encode_hash_ex(postarray, &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) {
-               if (qstr.c) {
-                       efree(qstr.c);
-               }
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode post data");
-               return FAILURE;
-       }
-       smart_str_0(&qstr);
-
-       status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len);
-       if (qstr.c) {
-               efree(qstr.c);
-       }
-       return status;
-}
-/* }}} */
-
-#endif
-/* }}} HAVE_CURL */
-
 /* {{{ STATUS http_auth_header(char *, char*) */
 PHP_HTTP_API STATUS _http_auth_header(const char *type, const char *realm TSRMLS_DC)
 {
@@ -2005,3 +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
  */