- get rid of 1001 strict-aliasing warnings
[m6w6/ext-http] / http_api.c
index 5bf39207c4ee7ce10630ddc1f8452c5cc9902679..c932266c5d38f75a5b315c26f76fdb3692459921 100644 (file)
@@ -1,49 +1,71 @@
 /*
-   +----------------------------------------------------------------------+
-   | PECL :: http                                                         |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 3.0 of the PHP license, that  |
-   | is bundled with this package in the file LICENSE, and is available   |
-   | through the world-wide-web at http://www.php.net/license/3_0.txt.    |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 2004-2005 Michael Wallner <mike@php.net>               |
-   +----------------------------------------------------------------------+
+    +--------------------------------------------------------------------+
+    | PECL :: http                                                       |
+    +--------------------------------------------------------------------+
+    | Redistribution and use in source and binary forms, with or without |
+    | modification, are permitted provided that the conditions mentioned |
+    | in the accompanying LICENSE file are met.                          |
+    +--------------------------------------------------------------------+
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#      include "config.h"
-#endif
-
-#include <ctype.h>
+#define HTTP_WANT_SAPI
+#include "php_http.h"
 
-#include "php.h"
+#include "php_output.h"
 #include "ext/standard/url.h"
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_api.h"
-#include "php_http_headers_api.h"
 #include "php_http_send_api.h"
 
 #ifdef ZEND_ENGINE_2
-#      include "zend_exceptions.h"
 #      include "php_http_exception_object.h"
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
+PHP_MINIT_FUNCTION(http_support)
+{
+       HTTP_LONG_CONSTANT("HTTP_SUPPORT", HTTP_SUPPORT);
+       HTTP_LONG_CONSTANT("HTTP_SUPPORT_REQUESTS", HTTP_SUPPORT_REQUESTS);
+       HTTP_LONG_CONSTANT("HTTP_SUPPORT_MAGICMIME", HTTP_SUPPORT_MAGICMIME);
+       HTTP_LONG_CONSTANT("HTTP_SUPPORT_ENCODINGS", HTTP_SUPPORT_ENCODINGS);
+       HTTP_LONG_CONSTANT("HTTP_SUPPORT_SSLREQUESTS", HTTP_SUPPORT_SSLREQUESTS);
+       
+       return SUCCESS;
+}
+
+PHP_HTTP_API long _http_support(long feature)
+{
+       long support = HTTP_SUPPORT;
+       
+#ifdef HTTP_HAVE_CURL
+       support |= HTTP_SUPPORT_REQUESTS;
+#      ifdef HTTP_HAVE_SSL
+       support |= HTTP_SUPPORT_SSLREQUESTS;
+#      endif
+#endif
+#ifdef HTTP_HAVE_MAGIC
+       support |= HTTP_SUPPORT_MAGICMIME;
+#endif
+#ifdef HTTP_HAVE_ZLIB
+       support |= HTTP_SUPPORT_ENCODINGS;
+#endif
 
-/* char *pretty_key(char *, size_t, zend_bool, zebd_bool) */
+       if (feature) {
+               return (feature == (support & feature));
+       }
+       return support;
+}
+
+/* char *pretty_key(char *, size_t, zend_bool, zend_bool) */
 char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
 {
        if (key && key_len) {
                size_t i;
                int wasalpha;
-               if (wasalpha = isalpha((int) key[0])) {
+               if ((wasalpha = isalpha((int) key[0]))) {
                        key[0] = (char) (uctitle ? toupper((int) key[0]) : tolower((int) key[0]));
                }
                for (i = 1; i < key_len; i++) {
@@ -62,137 +84,97 @@ char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool x
 }
 /* }}} */
 
-/* {{{ */
-void _http_key_list_default_decoder(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC)
-{
-       *decoded = estrndup(encoded, encoded_len);
-       *decoded_len = (size_t) php_url_decode(*decoded, encoded_len);
-}
-/* }}} */
-
-/* {{{ */
-STATUS _http_parse_key_list(const char *list, HashTable *items, char separator, http_key_list_decode_t decode, zend_bool first_entry_is_name_value_pair TSRMLS_DC)
-{
-       const char *key = list, *val = NULL;
-       int vallen = 0, keylen = 0, done = 0;
-       zval array;
-
-       Z_ARRVAL(array) = items;
-
-       if (!(val = strchr(list, '='))) {
-               return FAILURE;
-       }
-
-#define HTTP_KEYLIST_VAL(array, k, str, len) \
-       { \
-               char *decoded; \
-               size_t decoded_len; \
-               if (decode) { \
-                       decode(str, len, &decoded, &decoded_len TSRMLS_CC); \
-               } else { \
-                       decoded = estrdup(str); \
-                       decoded_len = len; \
-               } \
-               add_assoc_stringl(array, k, decoded, decoded_len, 0); \
-       }
-#define HTTP_KEYLIST_FIXKEY() \
-       { \
-                       while (isspace(*key)) ++key; \
-                       keylen = val - key; \
-                       while (isspace(key[keylen - 1])) --keylen; \
-       }
-#define HTTP_KEYLIST_FIXVAL() \
-       { \
-                       ++val; \
-                       while (isspace(*val)) ++val; \
-                       vallen = key - val; \
-                       while (isspace(val[vallen - 1])) --vallen; \
-       }
-
-       HTTP_KEYLIST_FIXKEY();
-
-       if (first_entry_is_name_value_pair) {
-               HTTP_KEYLIST_VAL(&array, "name", key, keylen);
-
-               /* just one name=value */
-               if (!(key = strchr(val, separator))) {
-                       key = val + strlen(val);
-                       HTTP_KEYLIST_FIXVAL();
-                       HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-                       goto list_done;
-               }
-               /* additional info appended */
-               else {
-                       HTTP_KEYLIST_FIXVAL();
-                       HTTP_KEYLIST_VAL(&array, "value", val, vallen);
-               }
-       }
-
-       do {
-               char *keydup = NULL;
-
-               if (!(val = strchr(key, '='))) {
-                       break;
-               }
-
-               /* start at 0 if first_entry_is_name_value_pair==0 */
-               if (zend_hash_num_elements(items)) {
-                       ++key;
-               }
-
-               HTTP_KEYLIST_FIXKEY();
-               keydup = estrndup(key, keylen);
-               if (!(key = strchr(val, separator))) {
-                       done = 1;
-                       key = val + strlen(val);
-               }
-               HTTP_KEYLIST_FIXVAL();
-               HTTP_KEYLIST_VAL(&array, keydup, val, vallen);
-               efree(keydup);
-       } while (!done);
-
-list_done:
-       return SUCCESS;
-}
-
 /* {{{ void http_error(long, long, char*) */
-void _http_error_ex(long type, long code, const char *format, ...)
+void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 {
        va_list args;
-       TSRMLS_FETCH();
-
+       
        va_start(args, format);
-       if (type == E_THROW) {
 #ifdef ZEND_ENGINE_2
+       if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
                char *message;
+               
                vspprintf(&message, 0, format, args);
                zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC);
-#else
-               type = E_WARNING;
+               efree(message);
+       } else
 #endif
-       }
-       if (type != E_THROW) {
-               php_verror(NULL, "", type, format, args TSRMLS_CC);
-       }
+       php_verror(NULL, "", type, format, args TSRMLS_CC);
        va_end(args);
 }
 /* }}} */
 
-/* {{{ STATUS http_exit(int, char*) */
-STATUS _http_exit_ex(int status, char *header, zend_bool free_header TSRMLS_DC)
+/* {{{ void http_log(char *, char *, char *) */
+void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 {
-       if (SUCCESS != http_send_status_header(status, header)) {
-               http_error_ex(E_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
-               if (free_header && header) {
-                       efree(header);
-               }
+       time_t now;
+       struct tm nowtm;
+       char datetime[20] = {0};
+       
+       now = HTTP_GET_REQUEST_TIME();
+       strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
+
+#define HTTP_LOG_WRITE(file, type, msg) \
+       if (file && *file) { \
+               php_stream *log = php_stream_open_wrapper_ex(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT); \
+                \
+               if (log) { \
+                       php_stream_printf(log TSRMLS_CC, "%s\t[%s]\t%s\t<%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \
+                       php_stream_close(log); \
+               } \
+        \
+       }
+       
+       HTTP_LOG_WRITE(file, ident, message);
+       HTTP_LOG_WRITE(HTTP_G->log.composite, ident, message);
+}
+/* }}} */
+
+static void http_ob_blackhole(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
+{
+       *handled_output = ecalloc(1,1);
+       *handled_output_len = 0;
+}
+
+/* {{{ STATUS http_exit(int, char*, char*) */
+STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC)
+{
+       if (    (send_header && (SUCCESS != http_send_status_header(status, header))) ||
+                       (!send_header && status && (SUCCESS != http_send_status(status)))) {
+               http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : "");
+               STR_FREE(header);
+               STR_FREE(body);
                return FAILURE;
        }
-       if (free_header && header) {
-               efree(header);
+       
+       if (!OG(ob_lock)) {
+               php_end_ob_buffers(0 TSRMLS_CC);
+       }
+       if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
+               PHPWRITE(body, strlen(body));
+       }
+       
+       switch (status)
+       {
+               case 301:       http_log(HTTP_G->log.redirect, "301-REDIRECT", header);                 break;
+               case 302:       http_log(HTTP_G->log.redirect, "302-REDIRECT", header);                 break;
+               case 303:       http_log(HTTP_G->log.redirect, "303-REDIRECT", header);                 break;
+               case 305:       http_log(HTTP_G->log.redirect, "305-REDIRECT", header);                 break;
+               case 307:       http_log(HTTP_G->log.redirect, "307-REDIRECT", header);                 break;
+               case 304:       http_log(HTTP_G->log.cache, "304-CACHE", header);                               break;
+               case 405:       http_log(HTTP_G->log.allowed_methods, "405-ALLOWED", header);   break;
+               default:        http_log(NULL, header, body);                                                                   break;
        }
-       zend_bailout();
-       /* fake */
+       
+       STR_FREE(header);
+       STR_FREE(body);
+       
+       if (HTTP_G->force_exit) {
+               zend_bailout();
+       } else {
+               php_ob_set_internal_handler(http_ob_blackhole, 4096, "blackhole", 0 TSRMLS_CC);
+       }
+       
        return SUCCESS;
 }
 /* }}} */
@@ -204,7 +186,7 @@ STATUS _http_check_method_ex(const char *method, const char *methods)
 
        if (    (found = strstr(methods, method)) &&
                        (found == method || !isalpha(found[-1])) &&
-                       (!isalpha(found[strlen(method) + 1]))) {
+                       (strlen(found) >= strlen(method) && !isalpha(found[strlen(method)]))) {
                return SUCCESS;
        }
        return FAILURE;
@@ -214,101 +196,99 @@ STATUS _http_check_method_ex(const char *method, const char *methods)
 /* {{{ zval *http_get_server_var_ex(char *, size_t) */
 PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC)
 {
+       zval **hsv;
        zval **var;
-       if (SUCCESS == zend_hash_find(HTTP_SERVER_VARS, (char *) key, key_size, (void **) &var)) {
-               if (check) {
-                       return Z_STRVAL_PP(var) && Z_STRLEN_PP(var) ? *var : NULL;
-               } else {
-                       return *var;
-               }
+#ifdef ZEND_ENGINE_2
+       zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+#endif
+       if ((SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) {
+               return NULL;
+       }
+       if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void *) &var)) || (Z_TYPE_PP(var) != IS_STRING)) {
+               return NULL;
+       }
+       if (check && !(Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
+               return NULL;
        }
-       return NULL;
+       return *var;
 }
 /* }}} */
 
-
-/* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */
-PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len,
-       char **decoded, size_t *decoded_len TSRMLS_DC)
+/* {{{ STATUS http_get_request_body(char **, size_t *) */
+PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC)
 {
-       const char *e_ptr;
-       char *d_ptr;
-
-       *decoded_len = 0;
-       *decoded = ecalloc(1, encoded_len);
-       d_ptr = *decoded;
-       e_ptr = encoded;
-
-       while (((e_ptr - encoded) - encoded_len) > 0) {
-               int no_crlf = 0;
-               char *n_ptr;
-               size_t chunk_len = 0;
-
-               chunk_len = strtol(e_ptr, &n_ptr, 16);
-
-               /* check if:
-                * - we could not read in chunk size
-                * - chunk size is not followed by HTTP_CRLF|NUL
-                */
-               if ((n_ptr == e_ptr) || (*n_ptr && (no_crlf = strncmp(n_ptr, HTTP_CRLF, lenof(HTTP_CRLF))))) {
-                       /* don't fail on apperently not encoded data */
-                       if (e_ptr == encoded) {
-                               memcpy(*decoded, encoded, encoded_len);
-                               *decoded_len = encoded_len;
-                               return encoded + encoded_len;
-                       } else {
-                               efree(*decoded);
-                               if (no_crlf) {
-                                       http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1));
-                               } else {
-                                       char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
-                                       http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
-                                       efree(error);
-                               }
-
-                               return NULL;
-                       }
-               } else {
-                       e_ptr = n_ptr;
+       *length = 0;
+       *body = NULL;
+       
+       if (SG(request_info).raw_post_data) {
+               *length = SG(request_info).raw_post_data_length;
+               *body = SG(request_info).raw_post_data;
+               
+               if (dup) {
+                       *body = estrndup(*body, *length);
                }
-
-               /* reached the end */
-               if (!chunk_len) {
-                       break;
+               return SUCCESS;
+       } else if (sapi_module.read_post && !HTTP_G->read_post_data) {
+               char buf[4096];
+               int len;
+               
+               HTTP_G->read_post_data = 1;
+               
+               while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+                       *body = erealloc(*body, *length + len + 1);
+                       memcpy(*body + *length, buf, len);
+                       *length += len;
+                       (*body)[*length] = '\0';
                }
-
-               memcpy(d_ptr, e_ptr += 2, chunk_len);
-               d_ptr += chunk_len;
-               e_ptr += chunk_len + 2;
-               *decoded_len += chunk_len;
+               
+               /* check for error */
+               if (len < 0) {
+                       STR_FREE(*body);
+                       *length = 0;
+                       return FAILURE;
+               }
+               
+               SG(request_info).raw_post_data = *body;
+               SG(request_info).raw_post_data_length = *length;
+               
+               if (dup) {
+                       *body = estrndup(*body, *length);
+               }
+               return SUCCESS;
        }
-
-       return e_ptr;
+       
+       return FAILURE;
 }
 /* }}} */
 
-/* {{{ STATUS http_split_response(char *, size_t, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_split_response(char *response, size_t response_len,
-       HashTable *headers, char **body, size_t *body_len TSRMLS_DC)
+/* {{{ php_stream *_http_get_request_body_stream(void) */
+PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
 {
-       char *header = response, *real_body = NULL;
-
-       while (0 < (response_len - (response - header + 4))) {
-               if (    (*response++ == '\r') &&
-                               (*response++ == '\n') &&
-                               (*response++ == '\r') &&
-                               (*response++ == '\n')) {
-                       real_body = response;
-                       break;
+       php_stream *s = NULL;
+       
+       if (SG(request_info).raw_post_data) {
+               s = php_stream_open_wrapper("php://input", "rb", 0, NULL);
+       } else if (sapi_module.read_post && !HTTP_G->read_post_data) {
+               HTTP_G->read_post_data = 1;
+               
+               if ((s = php_stream_temp_new())) {
+                       char buf[4096];
+                       int len;
+                       
+                       while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+                               php_stream_write(s, buf, len);
+                       }
+                       
+                       if (len < 0) {
+                               php_stream_close(s);
+                               s = NULL;
+                       } else {
+                               php_stream_rewind(s);
+                       }
                }
        }
-
-       if (real_body && (*body_len = (response_len - (real_body - header)))) {
-               *body = ecalloc(1, *body_len + 1);
-               memcpy(*body, real_body, *body_len);
-       }
-
-       return http_parse_headers_ex(header, headers, 1);
+       
+       return s;
 }
 /* }}} */