X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=c6d08d20b95088da63f584ffd5a817f4ee4bfe4f;hp=4f40fa520ab035a07c67c46edd22adaa31e2f069;hb=68dc6489387c3f5429fc7a85d2a02c2ad2957c44;hpb=dd579c42c06ebfe26ea2ff8ee6106a22d27e3340

diff --git a/php_http_api.h b/php_http_api.h
index 4f40fa5..c6d08d2 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -1,16 +1,13 @@
 /*
-   +----------------------------------------------------------------------+
-   | 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-2005, Michael Wallner <mike@php.net>            |
+    +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
@@ -18,8 +15,16 @@
 #ifndef PHP_HTTP_API_H
 #define PHP_HTTP_API_H
 
-#include "php_http_std_defs.h"
-#include "php_http_send_api.h"
+#define HTTP_SUPPORT				0x01L
+#define HTTP_SUPPORT_REQUESTS		0x02L
+#define HTTP_SUPPORT_MAGICMIME		0x04L
+#define HTTP_SUPPORT_ENCODINGS		0x08L
+#define HTTP_SUPPORT_SSLREQUESTS	0x20L
+
+extern PHP_MINIT_FUNCTION(http_support);
+
+#define http_support(f) _http_support(f)
+PHP_HTTP_API long _http_support(long feature);
 
 #define pretty_key(key, key_len, uctitle, xhyphen) _http_pretty_key(key, key_len, uctitle, xhyphen)
 extern char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen);
@@ -57,6 +62,25 @@ extern void _http_error_ex(long type TSRMLS_DC, long code, const char *format, .
 			http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST"); \
 			action; \
 		}
+#define HTTP_CHECK_GZIP_LEVEL(level, action) \
+	if (level < -1 || level > 9) { \
+		http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid compression level (-1 to 9): %d", level); \
+		action; \
+	}
+
+#define HTTP_CHECK_HEADERS_SENT(action) \
+	if (SG(headers_sent) && !SG(request_info).no_headers) { \
+		char *output_start_filename = php_get_output_start_filename(TSRMLS_C); \
+		int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); \
+		 \
+		if (output_start_filename) { \
+			http_error_ex(HE_WARNING, HTTP_E_HEADER, "Cannot modify header information - headers already sent by (output started at %s:%d)", \
+				output_start_filename, output_start_lineno); \
+		} else { \
+			http_error(HE_WARNING, HTTP_E_HEADER, "Cannot modify header information - headers already sent"); \
+		} \
+		action; \
+	}
 
 
 #define http_log(f, i, m) _http_log_ex((f), (i), (m) TSRMLS_CC)
@@ -81,15 +105,9 @@ extern STATUS _http_check_method_ex(const char *method, const char *methods);
 PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC);
 
 #define http_get_request_body(b, l) _http_get_request_body_ex((b), (l), 1 TSRMLS_CC)
-#define http_get_Request_body_ex(b, l, d) _http_get_request_body_ex((b), (l), (d) TSRMLS_CC)
+#define http_get_request_body_ex(b, l, d) _http_get_request_body_ex((b), (l), (d) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC);
 
-#define http_chunked_decode(e, el, d, dl) _http_chunked_decode((e), (el), (d), (dl) TSRMLS_CC)
-PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC);
-
-#define http_guess_content_type(mf, mm, d, l, m) _http_guess_content_type((mf), (mm), (d), (l), (m) TSRMLS_CC)
-PHP_HTTP_API char *_http_guess_content_type(const char *magic_file, long magic_mode, void *data_ptr, size_t data_len, http_send_mode mode TSRMLS_DC);
-
 
 #define http_locate_body _http_locate_body
 static inline const char *_http_locate_body(const char *message)
@@ -134,9 +152,10 @@ static inline zval *_convert_to_type(int type, zval *z)
 	}
 	return z;
 }
-#define convert_to_type_ex(t, z) _convert_to_type_ex((t), (z))
-static inline zval *_convert_to_type_ex(int type, zval *z)
+#define convert_to_type_ex(t, z, p) _convert_to_type_ex((t), (z), (p))
+static inline zval *_convert_to_type_ex(int type, zval *z, zval **p)
 {
+	*p = z;
 	if (Z_TYPE_P(z) != type) {
 		switch (type)
 		{
@@ -149,10 +168,14 @@ static inline zval *_convert_to_type_ex(int type, zval *z)
 			case IS_OBJECT:	convert_to_object_ex(&z);	break;
 		}
 	}
+	if (*p == z) {
+		*p = NULL;
+	} else {
+		*p = z;
+	}
 	return z;
 }
 
-
 #endif
 
 /*