Merge pull request #24 from zelgerj/master

added function appserver_stream_import_file_descriptor

Author: zelgerj

build.default.properties

@@ -10,17 +10,17 @@
 # ---- General Settings ---------------------------------------------------------
 php.ext.name = appserver
 
-release.version = 0.1.11
+release.version = 0.1.12
 release.stability = beta
-api.version = 0.1.11
+api.version = 0.1.12
 api.stability = beta
 
-php.version = 5.6.0beta4
+php.version = 5.5.10
 
 # for stable releases
 php.downloadurl = http://de1.php.net/get/php-${php.version}.tar.gz/from/this/mirror
 # for beta releases
-php.downloadurl = http://downloads.php.net/tyrael/php-${php.version}.tar.gz
+# php.downloadurl = http://downloads.php.net/tyrael/php-${php.version}.tar.gz
 
 php.configure = --prefix=/opt/appserver \
 				--enable-debug \
@@ -43,7 +43,7 @@ php.configure = --prefix=/opt/appserver \
                 --with-openssl \
                 --with-zlib \
 
-pthreads.version = 2.0.4
+pthreads.version = 1.0.1
 memcached.version = 2.1.0
 redis.version = 2.2.3
 apcu.version = 4.0.2

build.xml

@@ -186,7 +186,11 @@
         <exec executable="git" dir="${c-build.dir}/php/ext">
             <arg line="clone https://github.com/krakjoe/pthreads.git"/>
         </exec>
-    	-->
+    	
+    	<exec executable="git" dir="${c-build.dir}/php/ext">
+            <arg line="clone https://github.com/krakjoe/uopz.git"/>
+        </exec>
+         -->
 
         <antcall target="get-memcached-src"/>
         <untar src="/tmp/memcached-${memcached.version}.tgz" dest="/tmp" compression="gzip"/>
@@ -265,5 +269,15 @@
 			<arg line="./run-tests.php ${c-php-tests.dir}"/>
 		</exec>
 	</target>
+	
+	<!-- ==================================================================== -->
+    <!-- Runs php tests in verbose mode to show all testing relevant info     -->
+    <!-- ==================================================================== -->
+	<target name="run-tests-verbose" description="Runs the php tests">
+		<exec dir="${c-build.dir}/php" executable="php">
+			<env key="TEST_PHP_EXECUTABLE" value="${c-build.dir}/php/sapi/cli/php"/>
+			<arg line="./run-tests.php --show-all ${c-php-tests.dir}"/>
+		</exec>
+	</target>
 
 </project>

src/appserver.c

@@ -27,6 +27,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "ext/session/php_session.h"
+#include "ext/sockets/php_sockets.h"
 #include "php_appserver.h"
 #include "TSRM.h"
 #include "SAPI.h"
@@ -59,6 +60,7 @@ const zend_function_entry appserver_functions[] = {
     PHP_FE(appserver_get_http_response_code, NULL)
     PHP_FE(appserver_get_envs, NULL)
     PHP_FE(appserver_session_init, NULL)
+    PHP_FE(appserver_stream_import_file_descriptor, NULL)
     PHP_FE_END
 };
 
@@ -485,6 +487,28 @@ PHP_FUNCTION(appserver_set_headers_sent)
 	SG(headers_sent) = headers_sent_flag;
 }
 
+/* {{{ proto array appserver_stream_import_file_descriptor(resource $socket)
+        will return the file descriptor as int of a php stream resource ... /* }}} */
+PHP_FUNCTION(appserver_stream_import_file_descriptor)
+{
+	zval *zstream;
+	php_stream *stream;
+	PHP_SOCKET socket; /* fd */
+
+	/* parse params and get stream resources passed to function */
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) {
+		return;
+	}
+	/* get stream from given php userland zval */
+	php_stream_from_zval(stream, &zstream);
+	/* check if stream can be casted to a socket fd */
+	if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void**)&socket, 1)) {
+		/* return a negative long to declair a non existent fd */
+		RETURN_LONG(-1);
+	}
+	/* finally return the fd as long to userland*/
+	RETURN_LONG(socket)
+}
 
 // ---------------------------------------------------------------------------
 // Zend Extension Functions

src/appserver.php

@@ -64,3 +64,19 @@
     echo "CALL #$index move_uploaded_file: -> " .var_export(move_uploaded_file($temp_filename, '/tmp/move_uploaded_file_success'), true);
     echo PHP_EOL . "==========================================". PHP_EOL;
 }
+
+$streamServer = stream_socket_server('tcp://127.0.0.1:31337');
+$streamClient = fsockopen('tcp://127.0.0.1:31337');
+if (!$streamClient) {
+	die("Unable to create socket");
+}
+$streamConnection = stream_socket_accept($streamServer);
+echo 'CALL appserver_stream_import_file_descriptor($streamServer): -> ';
+echo var_export(appserver_stream_import_file_descriptor($streamServer), true);
+echo PHP_EOL . "==========================================". PHP_EOL;
+echo 'CALL appserver_stream_import_file_descriptor($streamClient): -> ';
+echo var_export(appserver_stream_import_file_descriptor($streamClient), true);
+echo PHP_EOL . "==========================================". PHP_EOL;
+echo 'CALL appserver_stream_import_file_descriptor($streamConnection): -> ';
+echo var_export(appserver_stream_import_file_descriptor($streamConnection), true);
+echo PHP_EOL . "==========================================". PHP_EOL;

src/php_appserver.h

@@ -75,6 +75,7 @@ PHP_FUNCTION(appserver_set_raw_post_data);
 PHP_FUNCTION(appserver_get_http_response_code);
 PHP_FUNCTION(appserver_get_envs);
 PHP_FUNCTION(appserver_session_init);
+PHP_FUNCTION(appserver_stream_import_file_descriptor);
 
 ZEND_BEGIN_MODULE_GLOBALS(appserver)
     appserver_llist         *headers;

src/tests/appserver_014.phpt

@@ -0,0 +1,20 @@
+--TEST--
+appserver: call appserver_stream_import_file_descriptor and check it's correct return values 
+--CREDITS--
+Johann Zelger <jz [at] techdivision [dot] com>
+--FILE--
+<?php
+$streamServer = stream_socket_server('tcp://127.0.0.1:31337');
+$streamClient = fsockopen('tcp://127.0.0.1:31337');
+if (!$streamClient) {
+	die("Unable to create socket");
+}
+$streamConnection = stream_socket_accept($streamServer);
+
+var_dump(appserver_stream_import_file_descriptor($streamServer));
+var_dump(appserver_stream_import_file_descriptor($streamClient));
+var_dump(appserver_stream_import_file_descriptor($streamConnection));
+--EXPECT--
+int(3)
+int(4)
+int(5)