X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_api.c;h=2be27d0c79632b50722ecdaec6493b5bb781cda6;hb=09c63e9aa5d552e91db75dcf5bc64ba33923348f;hp=55f5e886ef15c4ae7a93ffda1b6a6b99707cb30a;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c;p=m6w6%2Fext-http

diff --git a/http_api.c b/http_api.c
index 55f5e88..2be27d0 100644
--- a/http_api.c
+++ b/http_api.c
@@ -88,7 +88,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,18 +246,24 @@ 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)
 {
-	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;
 	}
 	
+	php_end_ob_buffers(0 TSRMLS_CC);
 	if (php_header(TSRMLS_C) && body) {
 		PHPWRITE(body, strlen(body));
 	}
@@ -276,8 +282,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;
 }
 /* }}} */