Merge pull request #18 from zelgerj/master

added userland function appserver_get_envs()

Author: zelgerj

build.default.properties

@@ -10,9 +10,9 @@
 # ---- General Settings ---------------------------------------------------------
 php.ext.name = appserver
 
-release.version = 0.1.8
+release.version = 0.1.9
 release.stability = beta
-api.version = 0.1.8
+api.version = 0.1.9
 api.stability = beta
 
 php.version = 5.5.10

pecl/package2.xml

@@ -46,6 +46,9 @@ xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/ta
         <file name="tests/appserver_007.phpt" role="test"/>
         <file name="tests/appserver_008.phpt" role="test"/>
         <file name="tests/appserver_009.phpt" role="test"/>
+        <file name="tests/appserver_010.phpt" role="test"/>
+        <file name="tests/appserver_011.phpt" role="test"/>
+        <file name="tests/appserver_012.phpt" role="test"/>
     </dir>
 </contents>
 <dependencies>

src/appserver.c

@@ -56,6 +56,7 @@ const zend_function_entry appserver_functions[] = {
     PHP_FE(appserver_redefine, NULL)
     PHP_FE(appserver_set_raw_post_data, NULL)
     PHP_FE(appserver_get_http_response_code, NULL)
+    PHP_FE(appserver_get_envs, NULL)
     PHP_FE_END
 };
 
@@ -262,6 +263,28 @@ PHP_MINFO_FUNCTION(appserver)
     DISPLAY_INI_ENTRIES();
 }
 
+/* {{{ proto boolean appserver_get_envs()
+ 	 	 Returns an array of all defined environmental variables set by system or using putenv */
+PHP_FUNCTION(appserver_get_envs)
+{
+	char **env, *tmp1, *tmp2;
+
+	/* init return value as array */
+	array_init(return_value);
+	/* iterate all envs and build up array */
+	for (env=environ; env!=NULL && *env !=NULL; env++) {
+		tmp1 = estrdup(*env);
+		if (!(tmp2=strchr(tmp1,'='))) { /* malformed entry? */
+			efree(tmp1);
+			continue;
+		}
+		*tmp2 = 0;
+		tmp2++;
+		add_assoc_string(return_value, tmp1, tmp2, 1);
+		efree(tmp1);
+	}
+}
+
 /* {{{ proto boolean appserver_get_http_response_code()
  	 	 gets the http response code if is set in sapi_headers hash table */
 PHP_FUNCTION(appserver_get_http_response_code)

src/php_appserver.h

@@ -73,6 +73,7 @@ PHP_FUNCTION(appserver_set_headers_sent);
 PHP_FUNCTION(appserver_redefine);
 PHP_FUNCTION(appserver_set_raw_post_data);
 PHP_FUNCTION(appserver_get_http_response_code);
+PHP_FUNCTION(appserver_get_envs);
 
 ZEND_BEGIN_MODULE_GLOBALS(appserver)
     appserver_llist         *headers;

src/tests/appserver_012.phpt

@@ -0,0 +1,19 @@
+--TEST--
+appserver: call appserver_get_envs and check if correct environmental vars are returned 
+--CREDITS--
+Johann Zelger <jz [at] techdivision [dot] com>
+--FILE--
+<?php
+putenv("APPSERVER_ENV_TEST1=TestValue1");
+putenv("APPSERVER_ENV_TEST2=TestValue2");
+putenv("APPSERVER_ENV_TEST3=TestValue3");
+$envs = appserver_get_envs();
+var_dump($envs["APPSERVER_ENV_TEST1"]);
+var_dump($envs["APPSERVER_ENV_TEST2"]);
+var_dump($envs["APPSERVER_ENV_TEST3"]);
+var_dump(isset($envs["PWD"]));
+--EXPECT--
+string(10) "TestValue1"
+string(10) "TestValue2"
+string(10) "TestValue3"
+bool(true)