php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 01:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixed issue #115 (path issue when using phar)."

Browse Source 
We need another better way to fix this

This reverts commit 098855433d.

Conflicts:
	ext/opcache/ZendAccelerator.c
This commit is contained in:
Xinchen Hui
2013-11-06 16:53:45 +08:00
parent 63dba7ec9d
commit 9d75b9fb27
2 changed files with 5 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -75,7 +75,6 @@ PHP NEWS
imap). (ryotakatsuki at gmail dot com)
- OPcache:
. Fixed issue #115 (path issue when using phar). (Laruence)
. Added support for GNU Hurd. (Svante Signell)
. Added function opcache_compile_file() to load PHP scripts into cache
without execution. (Julien)

44
ext/opcache/ZendAccelerator.c
View File

@@ -37,7 +37,6 @@
#include "zend_API.h"
#include "zend_ini.h"
#include "TSRM/tsrm_virtual_cwd.h"
#include "ext/phar/php_phar.h"
#include "zend_accelerator_util_funcs.h"
#include "zend_accelerator_hash.h"
@@ -145,21 +144,6 @@ static inline int is_cacheable_stream_path(const char *filename)
memcmp(filename, "phar://", sizeof("phar://") - 1) == 0;
}
static inline int is_phar_relative_alias_path(const char *filename, char **alias, int *alias_len)
{
if (memcmp(filename, "phar://", sizeof("phar://") - 1) == 0
&& filename[sizeof("phar://") - 1] != '\0' && filename[sizeof("phar://") - 1] != '/') {
char *slash;
*alias = (char*)filename + sizeof("phar://") - 1;
slash = strstr(*alias, "/");
if (slash) {
*alias_len = slash - *alias;
return 1;
}
}
return 0;
}
/* O+ overrides PHP chdir() function and remembers the current working directory
* in ZCG(cwd) and ZCG(cwd_len). Later accel_getcwd() can use stored value and
* avoid getcwd() call.
@@ -1044,33 +1028,15 @@ char *accel_make_persistent_key_ex(zend_file_handle *file_handle, int path_lengt
}
memcpy(ZCG(key) + cur_len, include_path, include_path_len);
ZCG(key)[key_length] = '\0';
} else {
/* not use_cwd */
key_length = path_length;
} else {
/* not use_cwd */
key_length = path_length;
if ((size_t)key_length >= sizeof(ZCG(key))) {
ZCG(key_len) = 0;
return NULL;
} else {
char *alias;
int alias_len;
if (is_phar_relative_alias_path(file_handle->filename, &alias, &alias_len)) {
char *phar_path;
int phar_path_len;
if (phar_resolve_alias(alias, alias_len, &phar_path, &phar_path_len TSRMLS_CC) == SUCCESS) {
int filename_len = strlen(file_handle->filename);
memcpy(ZCG(key), "phar://", sizeof("phar://") -1);
memcpy(ZCG(key) + sizeof("phar://") - 1, phar_path, phar_path_len);
memcpy(ZCG(key) + sizeof("phar://") - 1 + phar_path_len,
alias + alias_len, filename_len - alias_len - sizeof("phar://") + 2);
key_length = filename_len + (phar_path_len - alias_len);
} else {
memcpy(ZCG(key), file_handle->filename, key_length + 1);
}
} else {
memcpy(ZCG(key), file_handle->filename, key_length + 1);
}
}
}
memcpy(ZCG(key), file_handle->filename, key_length + 1);
}
*key_len = ZCG(key_len) = key_length;
return ZCG(key);