X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_api.c;h=a5ecb12ec66fbdae50e81974a144c526ddb841b0;hb=8fa713be4960d51958523429ee0e7dfca6d017fb;hp=04e012133e8d94ace630d136b7c0e6908c201dcb;hpb=64de794f91af7565602a1183c5ed3fda2de99f35;p=m6w6%2Fext-http

diff --git a/http_api.c b/http_api.c
index 04e0121..a5ecb12 100644
--- a/http_api.c
+++ b/http_api.c
@@ -21,7 +21,6 @@
 #include "SAPI.h"
 #include "php_output.h"
 #include "ext/standard/url.h"
-#include "ext/standard/head.h"
 
 #include "php_http_api.h"
 #include "php_http_send_api.h"
@@ -56,7 +55,7 @@ PHP_HTTP_API long _http_support(long feature)
 #ifdef HTTP_HAVE_MAGIC
 	support |= HTTP_SUPPORT_MAGICMIME;
 #endif
-#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
+#ifdef HTTP_HAVE_ZLIB
 	support |= HTTP_SUPPORT_ENCODINGS;
 #endif
 
@@ -211,6 +210,8 @@ void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC)
 	struct tm nowtm;
 	char datetime[128];
 	
+	HTTP_CHECK_OPEN_BASEDIR(file, return);
+	
 	time(&now);
 	strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
 
@@ -248,7 +249,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 	}
 	
 	php_end_ob_buffers(0 TSRMLS_CC);
-	if (php_header(TSRMLS_C) && body) {
+	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
 		PHPWRITE(body, strlen(body));
 	}