- simplify http_send_header API

[m6w6/ext-http] / http_message_api.c

diff --git a/http_message_api.c b/http_message_api.c
index 7f22d17095d1a5afb90da96969edc411914e2e73..8d062b1bac600e3bb6e48a385a0f30372addd103 100644 (file)
--- a/http_message_api.c
+++ b/http_message_api.c
@@ -18,8 +18,8 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-
 #include "php.h"
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -31,6 +31,8 @@
 
 #include "phpstr/phpstr.h"
 
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
 #define http_message_headers_cb _http_message_headers_cb
 static void _http_message_headers_cb(const char *http_line, HashTable **headers, void **message TSRMLS_DC)
 {
@@ -59,14 +61,14 @@ static void _http_message_headers_cb(const char *http_line, HashTable **headers,
        // response
        if (!strncmp(http_line, "HTTP/1.", lenof("HTTP/1."))) {
                new->type = HTTP_MSG_RESPONSE;
-               new->info.response.http_version = (float) atof(http_line + lenof("HTTP/"));
+               new->info.response.http_version = atof(http_line + lenof("HTTP/"));
                new->info.response.code = atoi(http_line + lenof("HTTP/1.1 "));
        } else
        // request
        if (!strncmp(http_line + line_length - lenof("HTTP/1.1"), "HTTP/1.", lenof("HTTP/1."))) {
                const char *method_sep_uri = strchr(http_line, ' ');
                new->type = HTTP_MSG_REQUEST;
-               new->info.request.http_version = (float) atof(http_line + line_length - lenof("1.1"));
+               new->info.request.http_version = atof(http_line + line_length - lenof("1.1"));
                new->info.request.method = estrndup(http_line, method_sep_uri - http_line);
                new->info.request.URI = estrndup(method_sep_uri + 1, http_line + line_length - method_sep_uri - 1 - lenof(" HTTP/1.1"));
        }
@@ -94,17 +96,6 @@ static inline void _http_message_init_type(http_message *message, http_message_t
        }
 }
 
-#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h))
-#define http_message_header_ex _http_message_header_ex
-static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len)
-{
-       zval **header;
-       if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void **) &header)) {
-               return *header;
-       }
-       return NULL;
-}
-
 PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type)
 {
        if (!message) {
@@ -190,7 +181,7 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                                                zval *len;
                                                char *tmp;
 
-                                               spprintf(&tmp, 0, "%lu", decoded_len);
+                                               spprintf(&tmp, 0, "%lu", (ulong) decoded_len);
                                                MAKE_STD_ZVAL(len);
                                                ZVAL_STRING(len, tmp, 0);
 
@@ -213,8 +204,10 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char
                } else
 
                /* no headers that indicate content length */
-               if (1) {
+               if (HTTP_MSG_TYPE(RESPONSE, msg)) {
                        phpstr_from_string_ex(PHPSTR(msg), body, message + message_length - body);
+               } else {
+                       continue_at = body;
                }
 
                /* check for following messages */
@@ -336,10 +329,17 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
 
                        FOREACH_HASH_KEYVAL(&message->hdrs, key, idx, val) {
                                if (key) {
-                                       char *header;
-                                       spprintf(&header, 0, "%s: %s", key, Z_STRVAL_PP(val));
-                                       http_send_header(header);
-                                       efree(header);
+                                       if (Z_TYPE_PP(val) == IS_ARRAY) {
+                                               zend_bool first = 1;
+                                               zval **data;
+                                               
+                                               FOREACH_VAL(*val, data) {
+                                                       http_send_header_ex(key, strlen(key), Z_STRVAL_PP(data), Z_STRLEN_PP(data), first);
+                                                       first = 0;
+                                               }
+                                       } else {
+                                               http_send_header_ex(key, strlen(key), Z_STRVAL_PP(val), Z_STRLEN_PP(val), 1);
+                                       }
                                        key = NULL;
                                }
                        }
@@ -391,21 +391,21 @@ PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC)
                        if (!strcasecmp("HEAD", message->info.request.method)) {
                                rs = http_head(uri, Z_ARRVAL(options), NULL, NULL);
                        } else {
-                               http_error_ex(E_WARNING, HTTP_E_MSG,
+                               http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD,
                                        "Cannot send HttpMessage. Request method %s not supported",
                                        message->info.request.method);
                        }
 
                        efree(uri);
 #else
-                       http_error(E_WARNING, HTTP_E_MSG, "HTTP requests not supported - ext/http was not linked against libcurl.");
+                       http_error(HE_WARNING, HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl.");
 #endif
                }
                break;
 
                case HTTP_MSG_NONE:
                default:
-                       http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is neither of type HTTP_MSG_REQUEST nor HTTP_MSG_RESPONSE");
+                       http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HTTP_MSG_REQUEST nor HTTP_MSG_RESPONSE");
                break;
        }
 
@@ -465,3 +465,4 @@ PHP_HTTP_API void _http_message_free(http_message *message)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+