* keep winsock crap outta door

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 2bc553e2763c4d1211942e86f470fbfff5d0df34..c5f25cfbb78b10d854b247c7a4e00fc5e55c5422 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -15,6 +15,7 @@
 
 /* $Id$ */
 
+#define _WINSOCKAPI_
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
 #ifdef HAVE_CONFIG_H
@@ -202,7 +203,8 @@ static int http_sort_q(const void *a, const void *b TSRMLS_DC)
 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];
+       char ssb_buf[127];
+       unsigned char digest[16];
        PHP_MD5_CTX ctx;
 
        PHP_MD5Init(&ctx);
@@ -289,8 +291,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;
 
@@ -842,10 +843,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,12 +1163,17 @@ 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);
 
+       if (!etag_len){
+               php_error_docref(NULL TSRMLS_CC,E_ERROR,
+                       "Sending empty Etag (previous: %s)\n", HTTP_G(etag));
+               return FAILURE;
+       }
        /* remember */
        if (HTTP_G(etag)) {
                efree(HTTP_G(etag));
@@ -1519,7 +1525,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 +1533,24 @@ 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 = ecalloc(33, 1);
+               /* 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 (NULL == http_etag(&etag, data_ptr, data_size, data_mode)) {
+                       efree(etag);
                        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 +1617,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);
 }
 /* }}} */
 
@@ -1745,7 +1750,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 +1787,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);
                                                }