X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_api.h;h=3073ab4493f2115295a9efd82c812012a3ae7bbb;hp=bc5185161a0f102afab995025a2a2d40b97ec0ad;hb=0acbfc76b5a3e4122a6d06d64bd834a810806656;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c

diff --git a/php_http_api.h b/php_http_api.h
index bc51851..3073ab4 100644
--- a/php_http_api.h
+++ b/php_http_api.h
@@ -22,7 +22,6 @@
 #define HTTP_SUPPORT_REQUESTS		0x02L
 #define HTTP_SUPPORT_MAGICMIME		0x04L
 #define HTTP_SUPPORT_ENCODINGS		0x08L
-#define HTTP_SUPPORT_MHASHETAGS		0x10L
 #define HTTP_SUPPORT_SSLREQUESTS	0x20L
 
 extern PHP_MINIT_FUNCTION(http_support);
@@ -72,6 +71,21 @@ extern void _http_error_ex(long type TSRMLS_DC, long code, const char *format, .
 		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)
 extern void http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC);
 
@@ -144,9 +158,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)
 		{
@@ -159,6 +174,11 @@ 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;
 }