sfox Sat May 24 13:13:48 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests/files blog.phar.inc config.xml
Removed files:
/php-src/ext/phar/tests config.xml
Modified files:
/php-src/ext/phar phar_object.c
/php-src/ext/phar/tests/files blog.phar
/php-src/ext/phar/tests front.phar.phpt
Log:
"We shouldn't need a full path to the mount"
- Fixed under Windows, cleaned up test
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.11&r2=1.266.2.12&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.11
php-src/ext/phar/phar_object.c:1.266.2.12
--- php-src/ext/phar/phar_object.c:1.266.2.11 Thu May 22 06:33:09 2008
+++ php-src/ext/phar/phar_object.c Sat May 24 13:13:47 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.266.2.11 2008/05/22 06:33:09 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.12 2008/05/24 13:13:47 sfox Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -456,6 +456,10 @@
fname = zend_get_executed_filename(TSRMLS_C);
fname_len = strlen(fname);
+#ifdef PHP_WIN32
+ phar_unixify_path_separators(fname, fname_len);
+#endif
+
if (fname_len > 7 && !memcmp(fname, "phar://", 7) && SUCCESS ==
phar_split_fname(fname, fname_len, &arch, &arch_len, &entry, &entry_len, 2, 0
TSRMLS_CC)) {
efree(entry);
entry = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/phar/tests/files/blog.phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/front.phar.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/phar/tests/front.phar.phpt
diff -u php-src/ext/phar/tests/front.phar.phpt:1.1.2.1
php-src/ext/phar/tests/front.phar.phpt:1.1.2.2
--- php-src/ext/phar/tests/front.phar.phpt:1.1.2.1 Sun May 18 23:41:08 2008
+++ php-src/ext/phar/tests/front.phar.phpt Sat May 24 13:13:47 2008
@@ -13,4 +13,13 @@
--FILE_EXTERNAL--
files/blog.phar
--EXPECT--
-string(0) ""
\ No newline at end of file
+string(167) "<xml version="1.0" encoding="UTF-8">
+<config>
+ <database>
+ <host>localhost</name>
+ <user>squirrel</user>
+ <pass>nuts</pass>
+ <db>hoard</db>
+ </database>
+</config>
+"
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar.inc?view=markup&rev=1.1
Index: php-src/ext/phar/tests/files/blog.phar.inc
+++ php-src/ext/phar/tests/files/blog.phar.inc
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/config.xml?view=markup&rev=1.1
Index: php-src/ext/phar/tests/files/config.xml
+++ php-src/ext/phar/tests/files/config.xml
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
