sfox            Tue May 13 14:11:24 2008 UTC

  Added files:                 (Branch: PHP_5_3)
    /php-src/ext/phar/tests     phar_dotted_path.phpt 

  Modified files:              
    /php-src/ext/phar   phar.c 
  Log:
  - Allow broken.dirnames to use phar too
  - Add test
  - Kill MSVC compiler warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370&r2=1.370.2.1&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370 php-src/ext/phar/phar.c:1.370.2.1
--- php-src/ext/phar/phar.c:1.370       Mon May 12 20:42:06 2008
+++ php-src/ext/phar/phar.c     Tue May 13 14:11:24 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar.c,v 1.370 2008/05/12 20:42:06 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.1 2008/05/13 14:11:24 sfox Exp $ */
 
 #define PHAR_MAIN 1
 #include "phar_internal.h"
@@ -1606,7 +1606,7 @@
                                        
zend_hash_move_forward(&(PHAR_GLOBALS->phar_fname_map));
                                        continue;
                                }
-                               if (!memcmp(filename, key, keylen) && 
(filename_len == keylen
+                               if (!memcmp(filename, key, keylen) && 
((uint)filename_len == keylen
                                        || filename[keylen] == '/' || 
filename[keylen] == '\0')) {
                                        if (FAILURE == 
zend_hash_get_current_data(&(PHAR_GLOBALS->phar_fname_map), (void **) &pphar)) {
                                                break;
@@ -1653,9 +1653,6 @@
                        return SUCCESS;
                case FAILURE :
                        /* look for more extensions */
-                       if (is_complete) {
-                               return FAILURE;
-                       }
                        pos = strchr(pos + 1, '.');
                        if (pos) {
                                *ext_str = NULL;
@@ -3026,7 +3023,7 @@
        php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
        php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
        php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
-       php_info_print_table_row(2, "CVS revision", "$Revision: 1.370 $");
+       php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.1 $");
        php_info_print_table_row(2, "Phar-based phar archives", "enabled");
        php_info_print_table_row(2, "Tar-based phar archives", "enabled");
        php_info_print_table_row(2, "ZIP-based phar archives", "enabled");

http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_dotted_path.phpt?view=markup&rev=1.1
Index: php-src/ext/phar/tests/phar_dotted_path.phpt
+++ php-src/ext/phar/tests/phar_dotted_path.phpt



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

Reply via email to