thetaphi Mon Mar 5 16:29:18 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/nsapi nsapi.c
Log:
snprintf patch
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.2&r2=1.69.2.3.2.3&diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.2
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.3
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.2 Sat Feb 24 02:17:28 2007
+++ php-src/sapi/nsapi/nsapi.c Mon Mar 5 16:29:18 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: nsapi.c,v 1.69.2.3.2.2 2007/02/24 02:17:28 helly Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.3 2007/03/05 16:29:18 thetaphi Exp $ */
/*
* PHP includes
@@ -310,7 +310,7 @@
PHP_MINFO_FUNCTION(nsapi)
{
php_info_print_table_start();
- php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.3.2.2 $");
+ php_info_print_table_row(2, "NSAPI Module Revision", "$Revision:
1.69.2.3.2.3 $");
php_info_print_table_row(2, "Server Software", system_version());
php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
(nsapi_servact_service)?((zend_ini_long("zlib.output_compression",
sizeof("zlib.output_compression"), 0))?"not supported with
zlib.output_compression":"enabled"):"not supported on this platform" );
@@ -642,7 +642,7 @@
nsapi_free(value);
}
- snprintf(buf, sizeof(buf), "%d", conf_getglobals()->Vport);
+ snprintf(buf, NS_BUF_SIZE, "%d", conf_getglobals()->Vport);
php_register_variable("SERVER_PORT", buf, track_vars_array TSRMLS_CC);
php_register_variable("SERVER_NAME",
conf_getglobals()->Vserver_hostname, track_vars_array TSRMLS_CC);
@@ -695,7 +695,7 @@
/* special variables in error mode */
if (rc->http_error) {
- snprintf(buf, sizeof(buf), "%d", rc->http_error);
+ snprintf(buf, NS_BUF_SIZE, "%d", rc->http_error);
php_register_variable("ERROR_TYPE", buf, track_vars_array
TSRMLS_CC);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
