added function appserver_register_file_upload(), appserver_set_headers_sent()

Author: zelgerj

build.default.properties

@@ -10,9 +10,9 @@
 # ---- General Settings ---------------------------------------------------------
 php.ext.name = appserver
 
-release.version = 0.1.0
+release.version = 0.1.1
 release.stability = beta
-api.version = 0.1.0
+api.version = 0.1.1
 api.stability = beta
 
 php.version = 5.5.2

pecl/package2.xml

@@ -26,7 +26,7 @@ xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/ta
     <api>${api.stability}</api>
 </stability>
 <license uri="http://www.php.net/license/3_01.txt">PHP 3.01</license>
-<notes>initital release</notes>
+<notes>version-release</notes>
 <contents>
     <dir name="/">
         <file name="CREDITS" role="doc" />

src/appserver.c

@@ -51,6 +51,8 @@ int (*appserver_orig_header_handler)(sapi_header_struct *h AS_SAPI_HEADER_OP_DC,
 
 const zend_function_entry appserver_functions[] = {
     PHP_FE(appserver_get_headers, NULL)
+    PHP_FE(appserver_register_file_upload, NULL)
+    PHP_FE(appserver_set_headers_sent, NULL)
     PHP_FE_END
 };
 
@@ -101,6 +103,7 @@ static void appserver_header_remove_by_prefix(appserver_llist *headers, char *pr
 
 static int appserver_header_handler(sapi_header_struct *h AS_SAPI_HEADER_OP_DC, sapi_headers_struct *s TSRMLS_DC)
 {
+
     if (APPSERVER_GLOBALS(headers)) {
         switch (op) {
 
@@ -142,26 +145,26 @@ static int appserver_header_handler(sapi_header_struct *h AS_SAPI_HEADER_OP_DC,
     //    return appserver_orig_header_handler(h AS_SAPI_HEADER_OP_CC, s TSRMLS_CC);
     // }
 
+    // set headers not be sent yet
+    SG(headers_sent) = 0;
+
     return SAPI_HEADER_ADD;
 }
 
-
 static void php_appserver_shutdown_globals (zend_appserver_globals *appserver_globals TSRMLS_DC)
 {
 
 }
 
 static void php_appserver_init_globals(zend_appserver_globals *appserver_globals)
 {
-
     /* Override header generation in SAPI */
     if (sapi_module.header_handler != appserver_header_handler) {
         appserver_orig_header_handler = sapi_module.header_handler;
         sapi_module.header_handler = appserver_header_handler;
     }
 
     appserver_globals->headers = NULL;
-
 }
 
 PHP_MSHUTDOWN_FUNCTION(appserver)
@@ -191,7 +194,6 @@ PHP_MINIT_FUNCTION(appserver)
 
 PHP_RINIT_FUNCTION(appserver)
 {
-
     APPSERVER_GLOBALS(headers) = appserver_llist_allocate(appserver_llist_string_destor);
 
     return SUCCESS;
@@ -213,6 +215,29 @@ PHP_MINFO_FUNCTION(appserver)
     */
 }
 
+PHP_FUNCTION(appserver_register_file_upload)
+{
+	char *path;
+	int path_len;
+	HashTable *uploaded_files = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &path, &path_len) == FAILURE) {
+		return;
+	}
+
+	// check if uploaded files sapi globals are not initialised
+	if (!SG(rfc1867_uploaded_files)) {
+		ALLOC_HASHTABLE(uploaded_files);
+		zend_hash_init(uploaded_files, 5, NULL, NULL, 0);
+		SG(rfc1867_uploaded_files) = uploaded_files;
+	}
+
+	// add to zend hash table
+	zend_hash_add(SG(rfc1867_uploaded_files), path, path_len + 1, &path, sizeof(char *), NULL);
+
+	RETURN_TRUE;
+}
+
 PHP_FUNCTION(appserver_get_headers)
 {
     appserver_llist_item *header_item;
@@ -225,6 +250,18 @@ PHP_FUNCTION(appserver_get_headers)
     }
 }
 
+PHP_FUNCTION(appserver_set_headers_sent)
+{
+	zend_bool headers_sent_flag = 0;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &headers_sent_flag) == FAILURE) {
+		return;
+	}
+
+	// set headers not be sent yet
+	SG(headers_sent) = headers_sent_flag;
+}
+
 
 // ---------------------------------------------------------------------------
 // Zend Extension Functions

src/appserver.php

@@ -25,6 +25,34 @@
 echo "SAPI_TYPE: " . PHP_SAPI;
 echo PHP_EOL . "==========================================". PHP_EOL;
 
-echo "CALL appserver_get_headers()" . PHP_EOL;
+appserver_set_headers_sent(true);
+$result = var_export(headers_sent(), true);
+echo "CALL appserver_set_headers_sent(true): -> headers_sent = " . $result . PHP_EOL;
+appserver_set_headers_sent(false);
+$result = var_export(headers_sent(), true);
+echo "CALL appserver_set_headers_sent(false): -> headers_sent = " . $result . PHP_EOL;
+echo PHP_EOL . "==========================================". PHP_EOL;
+
+echo "CALL appserver_get_headers(): -> ";
 echo var_export(appserver_get_headers(), true);
 echo PHP_EOL . "==========================================". PHP_EOL;
+
+echo "CALL headers_sent(): -> ";
+echo var_export(headers_sent(), true);
+echo PHP_EOL . "==========================================". PHP_EOL;
+
+
+$temp_filenames[] = tempnam('/tmp', '');
+$temp_filenames[] = tempnam('/tmp', '');
+$temp_filenames[] = tempnam('/tmp', '');
+$temp_filenames[] = tempnam('/tmp', '');
+
+foreach ($temp_filenames as $index => $temp_filename) {
+    file_put_contents($temp_filename, 'Hi there iam a upload file.');
+    echo "CALL #$index appserver_register_file_upload(): -> ";
+    echo var_export(appserver_register_file_upload($temp_filename), true);
+    echo PHP_EOL . "==========================================". PHP_EOL;
+    
+    echo "CALL #$index move_uploaded_file: -> " .var_export(move_uploaded_file($temp_filename, '/tmp/move_uploaded_file_success'), true);
+    echo PHP_EOL . "==========================================". PHP_EOL;
+}

src/php_appserver.h

@@ -64,9 +64,12 @@ PHP_RSHUTDOWN_FUNCTION(appserver);
 PHP_MINFO_FUNCTION(appserver);
 
 PHP_FUNCTION(appserver_get_headers);
+PHP_FUNCTION(appserver_register_file_upload);
+PHP_FUNCTION(appserver_set_headers_sent);
 
 ZEND_BEGIN_MODULE_GLOBALS(appserver)
     appserver_llist         *headers;
+	HashTable 				*uploaded_files;
     long                     pproftrace;
 ZEND_END_MODULE_GLOBALS(appserver)