X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_api.c;h=c932266c5d38f75a5b315c26f76fdb3692459921;hb=687515f3fa8863f97fd281152a80171ad438532d;hp=e3ea4dc0499d85f097ebdf80307a5b8e8cbb7114;hpb=1dbcba16c7ba9c580b12e9fdce49b6b2a190233b;p=m6w6%2Fext-http

diff --git a/http_api.c b/http_api.c
index e3ea4dc..c932266 100644
--- a/http_api.c
+++ b/http_api.c
@@ -147,7 +147,9 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header
 		return FAILURE;
 	}
 	
-	php_end_ob_buffers(0 TSRMLS_CC);
+	if (!OG(ob_lock)) {
+		php_end_ob_buffers(0 TSRMLS_CC);
+	}
 	if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
 		PHPWRITE(body, strlen(body));
 	}
@@ -196,11 +198,13 @@ 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)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) {
+#ifdef ZEND_ENGINE_2
+	zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
+#endif
+	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)) || (Z_TYPE_PP(var) != IS_STRING)) {
+	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))) {