- proper type checking, thanks Sara

[m6w6/ext-http] / http_api.c

diff --git a/http_api.c b/http_api.c
index 8030c0f5d358df3f1bb5360d3cb57d6e3b7969a4..6f6c5d63993175d7fbc080c12461c6d64307ddf8 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -15,33 +15,21 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#include "php.h"
+
+#include "php_http.h"
 
 #include "SAPI.h"
+#include "php_output.h"
 #include "ext/standard/url.h"
 #include "ext/standard/head.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_request_api.h"
 #include "php_http_send_api.h"
 
 #ifdef ZEND_ENGINE_2
-#      include "zend_exceptions.h"
 #      include "php_http_exception_object.h"
 #endif
 
-#include <ctype.h>
-
-#ifdef HTTP_HAVE_MAGIC
-#      if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC)
-#              define USE_MAGIC_STATIC
-#      endif
-#      include <magic.h>
-#endif
-
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
 PHP_MINIT_FUNCTION(http_support)
@@ -50,7 +38,6 @@ PHP_MINIT_FUNCTION(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_MHASHETAGS", HTTP_SUPPORT_MHASHETAGS);
        HTTP_LONG_CONSTANT("HTTP_SUPPORT_SSLREQUESTS", HTTP_SUPPORT_SSLREQUESTS);
        
        return SUCCESS;
@@ -66,9 +53,6 @@ PHP_HTTP_API long _http_support(long feature)
        support |= HTTP_SUPPORT_SSLREQUESTS;
 #      endif
 #endif
-#ifdef HTTP_HAVE_MHASH
-       support |= HTTP_SUPPORT_MHASHETAGS;
-#endif
 #ifdef HTTP_HAVE_MAGIC
        support |= HTTP_SUPPORT_MAGICMIME;
 #endif
@@ -88,7 +72,7 @@ char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool x
        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++) {
@@ -246,6 +230,12 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 }
 /* }}} */
 
+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)
 {
@@ -257,6 +247,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
                return FAILURE;
        }
        
+       php_end_ob_buffers(0 TSRMLS_CC);
        if (php_header(TSRMLS_C) && body) {
                PHPWRITE(body, strlen(body));
        }
@@ -275,8 +266,12 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
        STR_FREE(header);
        STR_FREE(body);
        
-       zend_bailout();
-       /* fake */
+       if (HTTP_G(force_exit)) {
+               zend_bailout();
+       } else {
+               php_ob_set_internal_handler(http_ob_blackhole, 4096, "blackhole", 0 TSRMLS_CC);
+       }
+       
        return SUCCESS;
 }
 /* }}} */
@@ -301,10 +296,10 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen
        zval **hsv;
        zval **var;
        
-       if (SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &hsv)) {
+       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)) {
+       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))) {
@@ -330,63 +325,6 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 /* }}} */
 
 
-/* {{{ char *http_guess_content_type(char *magic_file, long magic_mode, void *data, size_t size, http_send_mode mode) */
-PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmode, void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC)
-{
-       char *ct = NULL;
-
-#ifdef HTTP_HAVE_MAGIC
-       /*      magic_load() fails if MAGIC_MIME is set because it 
-               cowardly adds .mime to the file name */
-       struct magic_set *magic = magic_open(magicmode &~ MAGIC_MIME);
-       
-       if (!magic) {
-               http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
-       } else if (-1 == magic_load(magic, magicfile)) {
-               http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic));
-       } else {
-               const char *ctype = NULL;
-               
-               magic_setflags(magic, magicmode);
-               
-               switch (data_mode)
-               {
-                       case SEND_RSRC:
-                       {
-                               char *buffer;
-                               size_t b_len;
-                               
-                               b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0);
-                               ctype = magic_buffer(magic, buffer, b_len);
-                               efree(buffer);
-                       }
-                       break;
-                       
-                       case SEND_DATA:
-                               ctype = magic_buffer(magic, data_ptr, data_len);
-                       break;
-                       
-                       default:
-                               ctype = magic_file(magic, data_ptr);
-                       break;
-               }
-               
-               if (ctype) {
-                       ct = estrdup(ctype);
-               } else {
-                       http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to guess Content-Type: %s", magic_error(magic));
-               }
-       }
-       if (magic) {
-               magic_close(magic);
-       }
-#else
-       http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
-#endif
-       
-       return ct;
-}
-/* }}} */
 /*
  * Local variables:
  * tab-width: 4