pajoye                                   Fri, 25 Nov 2011 21:18:40 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=319846

Log:
- implement FR #60390, SERVER_PORT missing

Bug: https://bugs.php.net/60390 (Open) Missing _SERVER[SERVER_PORT]
      
Changed paths:
    U   php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
    U   php/php-src/trunk/sapi/cli/php_cli_server.c

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-11-25 
21:10:33 UTC (rev 319845)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c      2011-11-25 
21:18:40 UTC (rev 319846)
@@ -577,6 +577,12 @@
                sapi_cli_server_register_variable(track_vars_array, 
"SERVER_PROTOCOL", tmp TSRMLS_CC);
                efree(tmp);
        }
+       {
+               char *tmp;
+               spprintf(&tmp, 0, "%i",  client->server->port);
+               sapi_cli_server_register_variable(track_vars_array, 
"SERVER_PORT", tmp TSRMLS_CC);
+       }
+
        sapi_cli_server_register_variable(track_vars_array, "REQUEST_URI", 
client->request.request_uri TSRMLS_CC);
        sapi_cli_server_register_variable(track_vars_array, "REQUEST_METHOD", 
SG(request_info).request_method TSRMLS_CC);
        sapi_cli_server_register_variable(track_vars_array, "SCRIPT_NAME", 
client->request.vpath TSRMLS_CC);

Modified: php/php-src/trunk/sapi/cli/php_cli_server.c
===================================================================
--- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-11-25 21:10:33 UTC (rev 
319845)
+++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-11-25 21:18:40 UTC (rev 
319846)
@@ -577,6 +577,12 @@
                sapi_cli_server_register_variable(track_vars_array, 
"SERVER_PROTOCOL", tmp TSRMLS_CC);
                efree(tmp);
        }
+       {
+               char *tmp;
+               spprintf(&tmp, 0, "%i",  client->server->port);
+               sapi_cli_server_register_variable(track_vars_array, 
"SERVER_PORT", tmp TSRMLS_CC);
+       }
+
        sapi_cli_server_register_variable(track_vars_array, "REQUEST_URI", 
client->request.request_uri TSRMLS_CC);
        sapi_cli_server_register_variable(track_vars_array, "REQUEST_METHOD", 
SG(request_info).request_method TSRMLS_CC);
        sapi_cli_server_register_variable(track_vars_array, "SCRIPT_NAME", 
client->request.vpath TSRMLS_CC);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to