- separated http_check_method() from http_check_allowed_methods()

[m6w6/ext-http] / php_http_message_api.h

diff --git a/php_http_message_api.h b/php_http_message_api.h
index 507693f28ca70b5dbb77106f975dd8f322ff39e7..d60dc9861769dfb2f2d85bf1e4484650cf137c43 100644 (file)
--- a/php_http_message_api.h
+++ b/php_http_message_api.h
@@ -15,6 +15,9 @@
 
 /* $Id$ */
 
+#ifndef PHP_HTTP_MESSAGE_API_H
+#define PHP_HTTP_MESSAGE_API_H
+
 /*
 DUMP:
 HttpMessage
@@ -51,14 +54,11 @@ struct _http_message {
 
                struct {
                        float http_version;
-                       int status;
+                       int code;
                } response;
 
        } info;
 
-       size_t          len;
-       char            *raw;
-
        http_message *nested;
 };
 
@@ -70,9 +70,9 @@ struct _http_message {
 #define http_message_init_ex(m, t) _http_message_init_ex((m), (t))
 PHP_HTTP_API http_message *_http_message_init_ex(http_message *m, http_message_type t);
 
-#define http_message_parse(m, l) http_message_parse_ex((m), (l), 1)
-#define http_message_parse_ex(m, l, d) _http_message_parse_ex((m), (l), (d) TSRMLS_CC)
-PHP_HTTP_API http_message *_http_message_parse_ex(char *message, size_t length, zend_bool duplicate TSRMLS_DC);
+#define http_message_parse(m, l) http_message_parse_ex(NULL, (m), (l))
+#define http_message_parse_ex(h, m, l) _http_message_parse_ex((h), (m), (l) TSRMLS_CC)
+PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t length TSRMLS_DC);
 
 #define http_message_parse_headers_callback _http_message_parse_headers_callback
 PHP_HTTP_API void _http_message_parse_headers_callback(void *message, char *http_line, size_t line_length, HashTable **headers TSRMLS_DC);
@@ -85,6 +85,8 @@ PHP_HTTP_API void _http_message_dtor(http_message *message);
 #define http_message_free(m) _http_message_free((m))
 PHP_HTTP_API void _http_message_free(http_message *message);
 
+#endif
+
 /*
  * Local variables:
  * tab-width: 4