Merge pull request #31 from zelgerj/master

fixed bug where phpinfo as text granted non cli sapis

Author: zelgerj

src/appserver.c

@@ -205,8 +205,10 @@ PHP_MINIT_FUNCTION(appserver)
 {
     REGISTER_INI_ENTRIES();
 
-    /* Reset phpinfo output to be non text if defined in ini settings */
-    sapi_module.phpinfo_as_text = INI_INT("appserver.phpinfo_as_text");
+    /* Reset phpinfo output to be non text if defined in ini settings for sapi cli only */
+    if (strcmp(sapi_module.name, "cli") == 0) {
+    	sapi_module.phpinfo_as_text = INI_INT("appserver.phpinfo_as_text");
+    }
 
 	/* init globals */
     ZEND_INIT_MODULE_GLOBALS(appserver, php_appserver_init_globals, NULL);

src/tests/appserver_016.phpt

@@ -3,10 +3,9 @@ appserver: call phpinfo and check if is in text format
 --CREDITS--
 Johann Zelger <jz [at] techdivision [dot] com>
 --INI--
-appserver.phpinfo_as_text = 1
+appserver.phpinfo_as_text = 0
 --FILE--
 <?php
 phpinfo();
 --EXPECTF--
-phpinfo()
-%a
+<%a

src/tests/appserver_017.phpt

@@ -0,0 +1,11 @@
+--TEST--
+appserver: call phpinfo and check if is in non text format
+--CREDITS--
+Johann Zelger <jz [at] techdivision [dot] com>
+--INI--
+appserver.phpinfo_as_text = 0
+--FILE--
+<?php
+phpinfo();
+--EXPECTF--
+<%a