Merge pull request #13 from zelgerj/master

added default override of PHP_SAPI to appserver

Author: zelgerj

build.default.properties

@@ -9,10 +9,11 @@
 
 # ---- General Settings ---------------------------------------------------------
 php.ext.name = appserver
+php.sapi.name = appserver
 
-release.version = 0.1.5
+release.version = 0.1.6
 release.stability = beta
-api.version = 0.1.5
+api.version = 0.1.6
 api.stability = beta
 
 php.version = 5.5.10

pecl/package2.xml

@@ -29,14 +29,23 @@ xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/ta
 <notes>version-release</notes>
 <contents>
     <dir name="/">
-        <file name="LICENSE" role="doc" />
-        <file name="README" role="doc" />
-        <file name="config.m4" role="src" />
-        <file name="config.w32" role="src" />
-        <file name="appserver.c" role="src" />
-        <file name="php_appserver.h" role="src" />
-        <file name="appserver_llist.c" role="src" />
-        <file name="appserver_llist.h" role="src" />
+        <file name="LICENSE" role="doc"/>
+        <file name="README" role="doc"/>
+        <file name="config.m4" role="src"/>
+        <file name="config.w32" role="src"/>
+        <file name="appserver.c" role="src"/>
+        <file name="php_appserver.h" role="src"/>
+        <file name="appserver_llist.c" role="src"/>
+        <file name="appserver_llist.h" role="src"/>
+        <file name="tests/appserver_001.phpt" role="test"/>
+        <file name="tests/appserver_002.phpt" role="test"/>
+        <file name="tests/appserver_003.phpt" role="test"/>
+        <file name="tests/appserver_004.phpt" role="test"/>
+        <file name="tests/appserver_005.phpt" role="test"/>
+        <file name="tests/appserver_006.phpt" role="test"/>
+        <file name="tests/appserver_007.phpt" role="test"/>
+        <file name="tests/appserver_008.phpt" role="test"/>
+        <file name="tests/appserver_009.phpt" role="test"/>
     </dir>
 </contents>
 <dependencies>

src/appserver.c

@@ -194,9 +194,6 @@ PHP_MSHUTDOWN_FUNCTION(appserver)
 
 PHP_MINIT_FUNCTION(appserver)
 {
-	zval *const_value, *const_name;
-	char *sapiname;
-
     REGISTER_INI_ENTRIES();
 
 	/* init globals */
@@ -207,8 +204,27 @@ PHP_MINIT_FUNCTION(appserver)
 
 PHP_RINIT_FUNCTION(appserver)
 {
-    char *ptr;
-    char *str;
+    char *ptr, *str, *sapiconst = APPSERVER_CONSTANT_PHP_SAPI;
+    zend_constant *defined;
+    zval *new_phpsapi;
+    char *new_phpsapi_name = APPSERVER_SAPI_NAME;
+
+    /* create zval for new sapi string */
+    MAKE_STD_ZVAL(new_phpsapi);
+    ZVAL_STRING(new_phpsapi, new_phpsapi_name, 1);
+
+    /* check if PHP_SAPI const can be found to overwrite cli sapi name to appserver */
+    if (zend_hash_find(EG(zend_constants), sapiconst, strlen(sapiconst)+1, (void **) &defined) == SUCCESS) {
+    	/* create new constant with new php sapi name */
+    	zend_constant c;
+		c.value = *new_phpsapi;
+		c.flags = PHP_USER_CONSTANT;
+		c.name = zend_strndup(&sapiconst, strlen(sapiconst));
+		c.name_len = strlen(sapiconst) + 1;
+		c.module_number = 0;
+    	/* update PHP_SAPI constant in hash table */
+    	zend_hash_update(EG(zend_constants), sapiconst, strlen(sapiconst)+1, (void*)&c, sizeof(zend_constant), (void **)&c);
+    }
 
 	/* remove functions given in ini setting */
     ptr = strtok(INI_STR("appserver.remove_constants"), ",");
@@ -219,7 +235,6 @@ PHP_RINIT_FUNCTION(appserver)
      	ptr = strtok(NULL, ",");
     }
 
-
 	/* remove functions given in ini setting */
     ptr = strtok(INI_STR("appserver.remove_functions"), ",");
     while(ptr != NULL) {

src/php_appserver.h

@@ -26,7 +26,9 @@ extern zend_module_entry appserver_module_entry;
 #define phpext_appserver_ptr &appserver_module_entry
 
 #define APPSERVER_NAME "${php.ext.name}"
+#define APPSERVER_SAPI_NAME "${php.sapi.name}"
 #define APPSERVER_VERSION "${release.version}"
+#define APPSERVER_CONSTANT_PHP_SAPI "PHP_SAPI"
 
 #ifdef PHP_WIN32
 #    define PHP_APPSERVER_API __declspec(dllexport)

src/tests/appserver_009.phpt

@@ -0,0 +1,12 @@
+--TEST--
+appserver: check if PHP_SAPI is rewritten to appserver
+--CREDITS--
+Johann Zelger <jz [at] techdivision [dot] com>
+--FILE--
+<?php
+
+echo PHP_SAPI . "\r\n";
+
+?>
+--EXPECT--
+appserver