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

[Antony Dovgal]

tony2001                Thu Dec 28 13:30:25 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/apache        php_apache.c 
    /php-src/sapi/apache_hooks  php_apache.c 
  Log:
  MFH
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache/php_apache.c?r1=1.89.2.4.2.1&r2=1.89.2.4.2.2&diff_format=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.89.2.4.2.1 
php-src/sapi/apache/php_apache.c:1.89.2.4.2.2
--- php-src/sapi/apache/php_apache.c:1.89.2.4.2.1       Wed Sep  6 11:54:28 2006
+++ php-src/sapi/apache/php_apache.c    Thu Dec 28 13:30:25 2006
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.89.2.4.2.1 2006/09/06 11:54:28 nlopess Exp $ */
+/* $Id: php_apache.c,v 1.89.2.4.2.2 2006/12/28 13:30:25 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -235,9 +235,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);
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.1&r2=1.19.2.3.2.2&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.1 
php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.2
--- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.1 Wed Sep  6 11:54:29 2006
+++ php-src/sapi/apache_hooks/php_apache.c      Thu Dec 28 13:30:25 2006
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.19.2.3.2.1 2006/09/06 11:54:29 nlopess Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.2 2006/12/28 13:30:25 tony2001 Exp $ */
 
 #include "php_apache_http.h"
 
@@ -1637,9 +1637,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