[PHP-CVS] cvs: php-src(PHP_4_4) /sapi/apache php_apache.c

[Stanislav Malyshev]

stasMon Mar  5 21:59:03 2007 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/sapi/apachephp_apache.c 
  Log:
  MF5: use snprintf
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.69.2.5.4.3&r2=1.69.2.5.4.4&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.69.2.5.4.3 
php-src/sapi/apache/php_apache.c:1.69.2.5.4.4
--- php-src/sapi/apache/php_apache.c:1.69.2.5.4.3   Mon Jan  1 09:46:51 2007
+++ php-src/sapi/apache/php_apache.cMon Mar  5 21:59:02 2007
@@ -17,7 +17,7 @@
|  David Sklar <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: php_apache.c,v 1.69.2.5.4.3 2007/01/01 09:46:51 sebastian Exp $ */
+/* $Id: php_apache.c,v 1.69.2.5.4.4 2007/03/05 21:59:02 stas Exp $ */
 
 #include "php_apache_http.h"
 
@@ -201,10 +201,10 @@
 #endif
sprintf(output_buf, "%d", MODULE_MAGIC_NUMBER);
php_info_print_table_row(2, "Apache API Version", output_buf);
-   sprintf(output_buf, "%s:%u", serv->server_hostname, serv->port);
+   snprintf(output_buf, sizeof(output_buf), "%s:%u", 
serv->server_hostname, serv->port);
php_info_print_table_row(2, "Hostname:Port", output_buf);
 #if !defined(WIN32) && !defined(WINNT)
-   sprintf(output_buf, "%s(%d)/%d", user_name, (int)user_id, 
(int)group_id);
+   snprintf(output_buf, sizeof(output_buf), "%s(%d)/%d", user_name, 
(int)user_id, (int)group_id);
php_info_print_table_row(2, "User/Group", output_buf);
sprintf(output_buf, "Per Child: %d - Keep Alive: %s - Max Per 
Connection: %d", max_requests_per_child, serv->keep_alive ? "on":"off", 
serv->keep_alive_max);
php_info_print_table_row(2, "Max Requests", output_buf);

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

[PHP-CVS] cvs: php-src(PHP_4_4) /sapi/apache php_apache.c

[Antony Dovgal]

tony2001Thu Dec 28 13:30:34 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/sapi/apachephp_apache.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.69.2.5.4.1&r2=1.69.2.5.4.2&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.69.2.5.4.1 
php-src/sapi/apache/php_apache.c:1.69.2.5.4.2
--- php-src/sapi/apache/php_apache.c:1.69.2.5.4.1   Sun Jan  1 13:47:01 2006
+++ php-src/sapi/apache/php_apache.cThu Dec 28 13:30:34 2006
@@ -17,7 +17,7 @@
|  David Sklar <[EMAIL PROTECTED]> |
+--+
  */
-/* $Id: php_apache.c,v 1.69.2.5.4.1 2006/01/01 13:47:01 sniper Exp $ */
+/* $Id: php_apache.c,v 1.69.2.5.4.2 2006/12/28 13:30:34 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -224,9 +224,9 @@
if ((p = strrchr(name, '.'))) {
*p='\0'; /* Cut off ugly .c extensions on module names 
*/
}
-   strcat(modulenames, name);
+   strlcat(modulenames, name, sizeof(modulenames));
if (modp->next) {
-   strcat(modulenames, ", ");
+   strlcat(modulenames, ", ", sizeof(modulenames));
}
}
php_info_print_table_row(2, "Loaded Modules", modulenames);

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