* -dev version

* make package.xml installable
* fix etag sending
* fix mem-corruption in http_parse_headers() with empty header values
* fix http dates being truncated
* expand default allowed methods to all standard methods

diff --git a/http.c b/http.c
index 5aac8211837c9e01dd24b68e5cb3e81fffac4cbb..bdaed8a86b3b888afeb08cbe6c86fdd460e7c2ae 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1071,7 +1071,7 @@ static void php_http_init_globals(zend_http_globals *http_globals)
 
 /* {{{ static inline STATUS http_check_allowed_methods(char *, int) */
 #define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC)
-static inline STATUS _http_check_allowed_methods(char *methods, int length TSRMLS_DC)
+static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC)
 {
        if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) {
                char *allow_header = emalloc(length + sizeof("Allow: "));
@@ -1079,23 +1079,20 @@ static inline STATUS _http_check_allowed_methods(char *methods, int length TSRML
                http_send_header(allow_header);
                efree(allow_header);
                http_send_status(405);
-               return FAILURE;
+               zend_bailout();
        }
-       return SUCCESS;
 }
 /* }}} */
 
 /* {{{ PHP_INI */
 PHP_INI_MH(update_allowed_methods)
 {
-       if (SUCCESS != http_check_allowed_methods(new_value, new_value_length)) {
-               return FAILURE;
-       }
+       http_check_allowed_methods(new_value, new_value_length);
        return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
 PHP_INI_BEGIN()
-       STD_PHP_INI_ENTRY("http.allowed_methods", "HEAD,GET,POST", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
+       STD_PHP_INI_ENTRY("http.allowed_methods", "OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
 PHP_INI_END()
 /* }}} */
 
@@ -1125,7 +1122,8 @@ PHP_MSHUTDOWN_FUNCTION(http)
 PHP_RINIT_FUNCTION(http)
 {
        char *allowed_methods = INI_STR("http.allowed_methods");
-       return http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
+       http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
+       return SUCCESS;
 }
 /* }}} */
 

diff --git a/http_api.c b/http_api.c
index 2bc553e2763c4d1211942e86f470fbfff5d0df34..36211805e9781c3937997b0609301ce4c0cc1bcd 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -842,10 +842,10 @@ 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(1, 30);
+       char *date = ecalloc(31, 1);
 
        gmtime = php_gmtime_r(&t, &tmbuf);
-       snprintf(date, 29,
+       snprintf(date, 30,
                "%s, %02d %s %04d %02d:%02d:%02d GMT",
                days[gmtime->tm_wday], gmtime->tm_mday,
                months[gmtime->tm_mon], gmtime->tm_year + 1900,
@@ -1162,9 +1162,9 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag,
        int header_len;
        char *etag_header;
 
-       header_len = strlen("ETag: \"\"") + etag_len + 1;
-       etag_header = (char *) emalloc(header_len);
-       snprintf(etag_header, header_len - 1, "ETag: \"%s\"", etag);
+       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);
 
@@ -1745,7 +1745,7 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
 {
        char *colon = NULL, *line = NULL, *begin = header;
 
-       if (header_len < 8) {
+       if (header_len < 2) {
                return FAILURE;
        }
 
@@ -1782,7 +1782,7 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra
 
                                                if (value_len < 1) {
                                                        /* hm, empty header? */
-                                                       add_assoc_stringl(array, key, "", 0, 0);
+                                                       add_assoc_stringl(array, key, "", 0, 1);
                                                } else {
                                                        add_assoc_stringl(array, key, colon, value_len, 1);
                                                }

diff --git a/package.xml b/package.xml
index 3809bb3789e56b1305cfc571502124e073d5b182..c56a0e4aa72e23d0a3093ecd0e9b95cd40f00c6e 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -30,9 +30,9 @@
 
   <release>
     <version>0.4.0</version>
-    <date>2005-02-xx</date>
+    <date>2005-02-00</date>
     <state>alpha</state>
-    <notes><![CDATA[
+    <notes><![CDATA[*
 ]]>
     </notes>
   </release>

diff --git a/php_http.h b/php_http.h
index 105e4b661a8adcfa620f40c9917f6e56d62dfad8..04dc05a02f6e06dc6f155afe2827fe5c85a9adbc 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -18,7 +18,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.4.0"
+#define PHP_EXT_HTTP_VERSION "0.4.0-dev"
 
 /* make compile on Win32 */
 #include "php_streams.h"