Skip to content

Fix issue #147: allow to work with phar build shared #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix issue #147: allow to work with phar build shared #148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8a8c78
Fix issue #147: allow to work with phar build shared
remicollet Nov 4, 2013
4b0a10f
typeof is not really portable
remicollet Nov 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions ZendAccelerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,36 @@ static inline int is_cacheable_stream_path(const char *filename)
}

#ifdef HAVE_PHAR_HEADER

#ifndef COMPILE_DL_PHAR
# define opcache_phar_resolve_alias phar_resolve_alias
#elif defined(__GNUC__)
static __typeof__(phar_resolve_alias) *opcache_phar_resolve_alias;
#else
static int (*opcache_phar_resolve_alias)(char *alias, int alias_len, char **filename, int *filename_len TSRMLS_DC);
#endif

static inline int is_phar_relative_alias_path(const char *filename, char **alias, int *alias_len)
{
if (memcmp(filename, "phar://", sizeof("phar://") - 1) == 0
#ifdef COMPILE_DL_PHAR
static int pharloaded = -1;

/* Only once, retrieve phar_resolve_alias from phar module if loaded */
if (pharloaded < 0) {
zend_module_entry *phar;

if (zend_hash_find(&module_registry, "phar", 5, (void**)&phar) == SUCCESS) {
opcache_phar_resolve_alias = DL_FETCH_SYMBOL(phar->handle, "phar_resolve_alias");
pharloaded = (opcache_phar_resolve_alias ? 1 : 0);
} else {
pharloaded = 0;
}
}
if (pharloaded &&
#else
if (
#endif
memcmp(filename, "phar://", sizeof("phar://") - 1) == 0
&& filename[sizeof("phar://") - 1] != '\0' && filename[sizeof("phar://") - 1] != '/') {
char *slash;
*alias = (char*)filename + sizeof("phar://") - 1;
Expand Down Expand Up @@ -1062,7 +1089,7 @@ char *accel_make_persistent_key_ex(zend_file_handle *file_handle, int path_lengt
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) {
if (opcache_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);
Expand Down