Move wrong output buffer usage check to ob_gzhandler init.

Export some output buffer functions.

3 files changed, 24 insertions, 23 deletions

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index fb2e6ce55e..d5f2b924ad 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -905,6 +905,24 @@ PHP_FUNCTION(ob_gzhandler)
 		ZEND_WRONG_PARAM_COUNT();
 	}
 
+	/* check for wrong usages */
+	if (OG(ob_nesting_level>1)) {
+		if (php_ob_handler_used("ob_gzhandler" TSRMLS_CC)) {
+			php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler 'ob_gzhandler' cannot be used twice");
+			RETURN_FALSE;
+		}
+		if (php_ob_handler_used("mb_output_handler" TSRMLS_CC)) {
+			php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler 'ob_gzhandler' cannot be used after 'mb_output_handler'");
+			RETURN_FALSE;
+		}
+		if (php_ob_handler_used("URL-Rewriter" TSRMLS_CC)) {
+			php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler 'ob_gzhandler' cannot be used after 'URL-Rewriter'");
+			RETURN_FALSE;
+		}
+		if (php_ob_init_conflict("ob_gzhandler", "zlib output compression" TSRMLS_CC))
+			RETURN_FALSE;
+	}
+
 	if (ZLIBG(ob_gzhandler_status)==-1
 		|| zend_hash_find(&EG(symbol_table), "HTTP_SERVER_VARS", sizeof("HTTP_SERVER_VARS"), (void **) &data)==FAILURE
 		|| Z_TYPE_PP(data)!=IS_ARRAY
diff --git a/main/output.c b/main/output.c
index ec066765bb..bb52d00f2e 100644
--- a/main/output.c
+++ b/main/output.c
@@ -370,7 +370,7 @@ static inline void php_ob_allocate(TSRMLS_D)
 /* {{{ php_ob_init_conflict
  * Returns 1 if handler_set is already used and generates error message
  */
-static int php_ob_init_conflict(char *handler_new, char *handler_set TSRMLS_DC)
+PHPAPI int php_ob_init_conflict(char *handler_new, char *handler_set TSRMLS_DC)
 {
 	if (php_ob_handler_used(handler_set TSRMLS_CC))
 	{
@@ -387,26 +387,6 @@ static int php_ob_init_named(uint initial_size, uint block_size, char *handler_n
 {
 	int   handler_gz, handler_mb, handler_ic;
 
-	if (OG(ob_nesting_level>1)) {
-		/* check for specific handlers where rules apply */
-		handler_gz = strcmp(handler_name, "ob_gzhandler");
-		handler_mb = strcmp(handler_name, "mb_output_handler");
-		handler_ic = strcmp(handler_name, "ob_iconv_handler");
-		/* apply rules */
-		if (!handler_gz || !handler_mb || !handler_ic) {
-			if (php_ob_handler_used(handler_name TSRMLS_CC)) {
-				php_error_docref("ref.outcontrol" TSRMLS_CC, E_WARNING, "output handler '%s' cannot be used twice", handler_name);
-				return FAILURE;
-			}
-			if (!handler_gz && php_ob_init_conflict(handler_name, "zlib output compression" TSRMLS_CC))
-				return FAILURE;
-			if (!handler_mb && php_ob_init_conflict(handler_name, "ob_iconv_handler" TSRMLS_CC))
-				return FAILURE;
-			if (!handler_ic && php_ob_init_conflict(handler_name, "mb_output_handler" TSRMLS_CC))
-				return FAILURE;
-		}
-	}
-	
 	if (OG(ob_nesting_level)>0) {
 		if (OG(ob_nesting_level)==1) { /* initialize stack */
 			zend_stack_init(&OG(ob_buffers));
@@ -635,7 +615,7 @@ static inline void php_ob_prepend(const char *text, uint text_length)
 
 /* {{{ php_ob_get_buffer
  * Return the current output buffer */
-static int php_ob_get_buffer(zval *p TSRMLS_DC)
+PHPAPI int php_ob_get_buffer(zval *p TSRMLS_DC)
 {
 	if (OG(ob_nesting_level)==0) {
 		return FAILURE;
@@ -647,7 +627,7 @@ static int php_ob_get_buffer(zval *p TSRMLS_DC)
 
 /* {{{ php_ob_get_length
  * Return the size of the current output buffer */
-static int php_ob_get_length(zval *p TSRMLS_DC)
+PHPAPI int php_ob_get_length(zval *p TSRMLS_DC)
 {
 	if (OG(ob_nesting_level) == 0) {
 		return FAILURE;
diff --git a/main/php_output.h b/main/php_output.h
index 99810802ca..67d16a1741 100644
--- a/main/php_output.h
+++ b/main/php_output.h
@@ -41,6 +41,9 @@ PHPAPI char *php_get_output_start_filename(TSRMLS_D);
 PHPAPI int php_get_output_start_lineno(TSRMLS_D);
 PHPAPI void php_ob_set_internal_handler(php_output_handler_func_t internal_output_handler, uint buffer_size, char *handler_name, zend_bool erase TSRMLS_DC);
 PHPAPI int php_ob_handler_used(char *handler_name TSRMLS_DC);
+PHPAPI int php_ob_init_conflict(char *handler_new, char *handler_set TSRMLS_DC);
+PHPAPI int php_ob_get_buffer(zval *p TSRMLS_DC);
+PHPAPI int php_ob_get_length(zval *p TSRMLS_DC);
 
 PHP_FUNCTION(ob_start);
 PHP_FUNCTION(ob_flush);