This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
Fixed module loader to work with *.tar modules in IIS7.5 on Win 2008 R2 #5729
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -186,7 +186,7 @@ public function autoload($class) | |||
| $path = $path . $moduleClassPath; | |||
|
|
|||
| if ($path == '.' || substr($path, 0, 2) == './' || substr($path, 0, 2) == '.\\') { | |||
| $path = realpath('.') . substr($path, 1); | |||
| $path = getcwd() . substr($path, 1); | |||
| @@ -186,7 +186,10 @@ public function autoload($class) | |||
| $path = $path . $moduleClassPath; | |||
|
|
|||
| if ($path == '.' || substr($path, 0, 2) == './' || substr($path, 0, 2) == '.\\') { | |||
| $path = realpath('.') . substr($path, 1); | |||
| if (($basePath = realpath('.')) === false) { | |||
There was a problem hiding this comment.
Move the assignment out of the conditional, please.
Ocramius
added a commit
to Ocramius/zf2
that referenced
this pull request
Mar 4, 2014
Ocramius
added a commit
that referenced
this pull request
Mar 4, 2014
|
@jameslnewell FYI, I squshed the commits before merging |
gianarb
pushed a commit
to zendframework/zend-loader
that referenced
this pull request
May 15, 2015
gianarb
pushed a commit
to zendframework/zend-loader
that referenced
this pull request
May 15, 2015
…2008-tar-realpath' Close zendframework/zendframework#5729
gianarb
pushed a commit
to zendframework/zend-loader
that referenced
this pull request
May 15, 2015
…2008-tar-realpath' into develop Close zendframework/zendframework#5729
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
realpath('.')andrealpath('')were returning false on a particular machine with IIS7.5 on Win 2008 R2.