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

[Ilia Alshanetsky]

iliaa           Tue Oct  5 20:12:04 2004 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/sapi/apache        php_apache.c 
  Log:
  Possible fix for bug #29764
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache/php_apache.c?r1=1.86&r2=1.86.2.1&ty=u
Index: php-src/sapi/apache/php_apache.c
diff -u php-src/sapi/apache/php_apache.c:1.86 php-src/sapi/apache/php_apache.c:1.86.2.1
--- php-src/sapi/apache/php_apache.c:1.86       Thu Jan  8 03:18:03 2004
+++ php-src/sapi/apache/php_apache.c    Tue Oct  5 20:12:04 2004
@@ -17,7 +17,7 @@
    |          David Sklar <[EMAIL PROTECTED]>                             |
    +----------------------------------------------------------------------+
  */
-/* $Id: php_apache.c,v 1.86 2004/01/08 08:18:03 andi Exp $ */
+/* $Id: php_apache.c,v 1.86.2.1 2004/10/06 00:12:04 iliaa Exp $ */
 
 #include "php_apache_http.h"
 
@@ -524,9 +524,17 @@
        char *p;
        
        array_init(return_value);
+
+       if (!ap_loaded_modules) {
+               return;
+       }
        
        for (n = 0; ap_loaded_modules[n]; ++n) {
                char *s = (char *) ap_loaded_modules[n]->name;
+               if (!s) {
+                       continue;
+               }
+               
                if ((p = strchr(s, '.'))) {
                        add_next_index_stringl(return_value, s, (p - s), 1);
                } else {

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