cvs: php-src(PHP_5_3) /ext/phar dirstream.c
| From: | Greg Beaver | Date: | Sat, 30 Aug 2008 23:50:31 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar dirstream.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52798@lists.php.net to get a copy of this message | ||
cellog Sat Aug 30 23:50:31 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar dirstream.c
Log:
sync with pecl/phar, missed one line change
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/dirstream.c?r1=1.26.2.9&r2=1.26.2.10&diff_format=u
Index: php-src/ext/phar/dirstream.c
diff -u php-src/ext/phar/dirstream.c:1.26.2.9 php-src/ext/phar/dirstream.c:1.26.2.10
--- php-src/ext/phar/dirstream.c:1.26.2.9 Sat Aug 30 23:47:55 2008
+++ php-src/ext/phar/dirstream.c Sat Aug 30 23:50:31 2008
@@ -647,8 +647,8 @@
if (!entry->is_deleted &&
key_len > path_len &&
- memcmp(key, resource->path+1, path_len) == 0 &&
- IS_SLASH(key[path_len])) {
+ memcmp(str_key, resource->path+1, path_len) == 0 &&
+ IS_SLASH(str_key[path_len])) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: Directory not
empty");
if (entry->is_temp_dir) {
efree(entry->filename);