* separate http_parse_header() function (doesn't support folded headers yet)

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 059228d105a32c5585dc9af4c639a8b07d008a0f..f68f57e3d6aed62b6a6fec835f46e94ae3b1b286 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -23,15 +23,6 @@
 
 #include <ctype.h>
 
-#if defined(HAVE_CURL) && HAVE_CURL
-#      ifdef PHP_WIN32
-#      include <winsock2.h>
-#      include <sys/types.h>
-#      endif
-#include <curl/curl.h>
-#include <curl/easy.h>
-#endif
-
 #include "php.h"
 #include "php_version.h"
 #include "php_streams.h"
@@ -45,16 +36,27 @@
 
 #include "SAPI.h"
 
-#if (PHP_MAJOR_VERSION >= 5)
+#ifdef ZEND_ENGINE_2
 #include "ext/standard/php_http.h"
 #else
-#include "php_http_build_query.h"
 #include "http_build_query.c"
 #endif
 
 #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 */
@@ -142,7 +144,7 @@ static int check_month(char *month);
 static int check_tzone(char *tzone);
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && 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)
@@ -297,7 +299,7 @@ static STATUS _http_send_chunk(const void *data, const size_t begin,
 /* }}} */
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && 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)
@@ -473,12 +475,9 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti
        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);
-#if defined(ZTS)
+#ifdef ZTS
        curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
 #endif
-#if defined(PHP_DEBUG)
-       curl_easy_setopt(ch, CURLOPT_VERBOSE, 1);
-#endif
 
        if ((!options) || (1 > zend_hash_num_elements(options))) {
                return;
@@ -1085,12 +1084,6 @@ PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_D
                chr_ptr = 0;
        }
        retval = (t <= http_parse_date(modified));
-#if defined(PHP_DEBUG)
-       fprintf(stderr,
-               "\nComparing Last-Modified %s(%s)==%d:\n\t%d\n\t%d\n\n",
-               get_active_function_name(TSRMLS_C), entry, retval, t,
-               http_parse_date(modified));
-#endif
        efree(modified);
        return retval;
 }
@@ -1117,12 +1110,6 @@ PHP_HTTP_API int _http_etag_match(const char *entry, const char *etag TSRMLS_DC)
        } else {
                result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag));
        }
-#if defined(PHP_DEBUG)
-       fprintf(stderr,
-               "\nComparing E-Tag %s(%s)==%d:\n\t<%s>\n\t<%s>\n\n",
-               get_active_function_name(TSRMLS_C), entry, result,
-               Z_STRVAL_P(zetag), quoted_etag);
-#endif
        efree(quoted_etag);
        return result;
 }
@@ -1682,8 +1669,8 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded,
 }
 /* }}} */
 
-/* {{{ proto void http_split_response(zval *, zval *, zval *) */
-PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
+/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */
+PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders,
        zval *zbody TSRMLS_DC)
 {
        char *header, *response, *body = NULL;
@@ -1706,47 +1693,61 @@ PHP_HTTP_API void _http_split_response(const zval *zresponse, zval *zheaders,
                Z_TYPE_P(zbody) = IS_NULL;
        }
 
-       /* check for HTTP status - FIXXME: strchr() */
+       return http_parse_header(header, body - Z_STRVAL_P(zresponse), zheaders);
+}
+/* }}} */
+
+/* {{{ STATUS http_parse_header(char *, long, zval *) */
+PHP_HTTP_API STATUS _http_parse_header(char *header, long header_len, zval *array TSRMLS_DC)
+{
+       char *colon = NULL, *line = NULL, *begin = header;
+
+       if (header_len < 8) {
+               return FAILURE;
+       }
+
+       /* status code */
        if (!strncmp(header, "HTTP/1.", 7)) {
-               char *end = strchr(header, '\r');
-               add_assoc_stringl(zheaders, "Status",
+               char *end = strstr(header, "\r\n");
+               add_assoc_stringl(array, "Status",
                        header + strlen("HTTP/1.x "),
                        end - (header + strlen("HTTP/1.x ")), 1);
                header = end + 2;
        }
-       /* split headers */
-       {
-               char *colon = NULL, *line = header;
 
-               while ( (line - Z_STRVAL_P(zresponse) + 3) <
-                               (body - Z_STRVAL_P(zresponse))) {
-                       switch (*line++)
-                       {
-                               case '\r':
-                                       if (colon && (*line == '\n')) {
-                                               char *key = estrndup(header, colon - header);
-                                               add_assoc_stringl(zheaders, key,
-                                                       colon + 2, line - colon - 3, 1);
-                                               efree(key);
-
-                                               colon = NULL;
-                                               header += line - header + 1;
-                                       }
-                               break;
+       line = header;
 
-                               case ':':
-                                       if (!colon) {
-                                               colon = line - 1;
-                                       }
-                               break;
-                       }
+       /*
+        * FIXXME: support for folded headers
+        */
+       while (header_len > (line - begin)) {
+               switch (*line++)
+               {
+                       case 0:
+                       case '\r':
+                               if (colon && (*line == '\n')) {
+                                       char *key = estrndup(header, colon - header);
+                                       add_assoc_stringl(array, key, colon + 2, line - colon - 3, 1);
+                                       efree(key);
+
+                                       colon = NULL;
+                                       header += line - header + 1;
+                               }
+                       break;
+
+                       case ':':
+                               if (!colon) {
+                                       colon = line - 1;
+                               }
+                       break;
                }
        }
+       return SUCCESS;
 }
 /* }}} */
 
 /* {{{ HAVE_CURL */
-#if defined(HAVE_CURL) && 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,