]> granicus.if.org Git - php/commitdiff
remove hack introduced because of broken usage of php_resolve_path instead of zend_re...
authorGreg Beaver <cellog@php.net>
Mon, 28 Apr 2008 22:41:20 +0000 (22:41 +0000)
committerGreg Beaver <cellog@php.net>
Mon, 28 Apr 2008 22:41:20 +0000 (22:41 +0000)
ext/phar/phar.c

index 525c10ee0be6fcc18bc39dd1a631ec9432b2a9e0..1ca84aa5427eb6b7da3540ead5473d319b2cb1a8 100644 (file)
@@ -2874,21 +2874,6 @@ static zend_op_array *phar_compile_file(zend_file_handle *file_handle, int type
 #endif
                        }
                }
-       } else if (PHAR_G(cwd_init) && !strstr(file_handle->filename, "://")) {
-               if ((name = phar_find_in_include_path((char *) file_handle->filename, strlen(file_handle->filename), NULL TSRMLS_CC))) {
-                       zend_file_handle f = *file_handle;
-                       if (SUCCESS == phar_orig_zend_open((const char *)name, file_handle TSRMLS_CC)) {
-                               efree(name);
-                               name = NULL;
-                               file_handle->filename = f.filename;
-                               if (f.opened_path) {
-                                       efree(f.opened_path);
-                               }
-                               file_handle->free_filename = 1;
-                       } else {
-                               *file_handle = f;
-                       }
-               }
        }
        zend_try {
                failed = 0;