X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=549d283918b067ef7f35b465e4366e37c1720c26;hp=9943cd8f49cf55a516ff9bb3f49edd16b017bcef;hb=1382fe5a3ed5209ab05745ca95495885e85ff2a0;hpb=100b5ff381fe93e7ac4d7b0ea68f9b7256615e68

diff --git a/http_api.c b/http_api.c
index 9943cd8..549d283 100644
--- a/http_api.c
+++ b/http_api.c
@@ -1,50 +1,63 @@
 /*
-   +----------------------------------------------------------------------+
-   | 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 "php.h"
+#define HTTP_WANT_SAPI
+#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_send_api.h"
 
 #ifdef ZEND_ENGINE_2
-#	include "zend_exceptions.h"
 #	include "php_http_exception_object.h"
 #endif
 
-#include <ctype.h>
+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;
+}
 
-#ifdef HTTP_HAVE_MAGIC
-#	if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC)
-#		define USE_MAGIC_STATIC
+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
-#	include <magic.h>
+#endif
+#ifdef HTTP_HAVE_MAGIC
+	support |= HTTP_SUPPORT_MAGICMIME;
+#endif
+#ifdef HTTP_HAVE_ZLIB
+	support |= HTTP_SUPPORT_ENCODINGS;
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
+	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)
@@ -52,7 +65,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++) {
@@ -189,9 +202,9 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 {
 	time_t now;
 	struct tm nowtm;
-	char datetime[128];
+	char datetime[20] = {0};
 	
-	time(&now);
+	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) \
@@ -206,42 +219,53 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 	}
 	
 	HTTP_LOG_WRITE(file, ident, message);
-	HTTP_LOG_WRITE(HTTP_G(log).composite, 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 (status || send_header) {
-		if (SUCCESS != http_send_status_header(status, send_header ? header : NULL)) {
-			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 (	(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 (php_header(TSRMLS_C) && body) {
+	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 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;
+		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;
 	}
 	
 	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;
 }
 /* }}} */
@@ -253,7 +277,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;
@@ -266,10 +290,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))) {
@@ -284,139 +308,79 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_
 {
 	*length = 0;
 	*body = NULL;
-
+	
 	if (SG(request_info).raw_post_data) {
 		*length = SG(request_info).raw_post_data_length;
-		*body = (char *) (dup ? estrndup(SG(request_info).raw_post_data, *length) : SG(request_info).raw_post_data);
+		*body = SG(request_info).raw_post_data;
+		
+		if (dup) {
+			*body = estrndup(*body, *length);
+		}
 		return SUCCESS;
-	}
-	return FAILURE;
-}
-/* }}} */
-
-/* {{{ 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)
-{
-	const char *e_ptr;
-	char *d_ptr;
-	long rest;
-	
-	*decoded_len = 0;
-	*decoded = ecalloc(1, encoded_len);
-	d_ptr = *decoded;
-	e_ptr = encoded;
-
-	while ((rest = encoded + encoded_len - e_ptr) > 0) {
-		long chunk_len = 0;
-		int EOL_len = 0, eol_mismatch = 0;
-		char *n_ptr;
-
-		chunk_len = strtol(e_ptr, &n_ptr, 16);
-
-		/* check if:
-		 * - we could not read in chunk size
-		 * - we got a negative chunk size
-		 * - chunk size is greater then remaining size
-		 * - chunk size is not followed by (CR)LF|NUL
-		 */
-		if (	(n_ptr == e_ptr) ||	(chunk_len < 0) || (chunk_len > rest) || 
-				(*n_ptr && (eol_mismatch = (n_ptr != http_locate_eol(e_ptr, &EOL_len))))) {
-			/* 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 (eol_mismatch) {
-					if (EOL_len == 2) {
-						http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%X 0x%X)", *n_ptr, *(n_ptr + 1));
-					} else {
-						http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0A; got: 0x%X)", *n_ptr);
-					}
-				} else {
-					char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n "));
-					http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
-					efree(error);
-				}
-				return NULL;
-			}
-		} else {
-			e_ptr = n_ptr;
+	} 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';
 		}
-
-		/* reached the end */
-		if (!chunk_len) {
-			break;
+		
+		/* check for error */
+		if (len < 0) {
+			STR_FREE(*body);
+			*length = 0;
+			return FAILURE;
 		}
-
-		memcpy(d_ptr, e_ptr += EOL_len, chunk_len);
-		d_ptr += chunk_len;
-		e_ptr += chunk_len + EOL_len;
-		*decoded_len += chunk_len;
+		
+		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;
 }
 /* }}} */
 
-/* {{{ 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)
+/* {{{ php_stream *_http_get_request_body_stream(void) */
+PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D)
 {
-	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);
+	php_stream *s = NULL;
 	
-	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);
+	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;
 		
-		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;
+		if ((s = php_stream_temp_new())) {
+			char buf[4096];
+			int len;
 			
-			case SEND_DATA:
-				ctype = magic_buffer(magic, data_ptr, data_len);
-			break;
+			while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+				php_stream_write(s, buf, len);
+			}
 			
-			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 (len < 0) {
+				php_stream_close(s);
+				s = NULL;
+			} else {
+				php_stream_rewind(s);
+			}
 		}
 	}
-	if (magic) {
-		magic_close(magic);
-	}
-#else
-	http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available");
-#endif
 	
-	return ct;
+	return s;
 }
 /* }}} */
+
 /*
  * Local variables:
  * tab-width: 4