projects
/
php
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e2cba9
)
- Fixed bug #51627 (script path not correctly evaluated)
author
Felipe Pena
<felipe@php.net>
Wed, 21 Apr 2010 22:22:31 +0000
(22:22 +0000)
committer
Felipe Pena
<felipe@php.net>
Wed, 21 Apr 2010 22:22:31 +0000
(22:22 +0000)
Patch by: russell dot tempero at rightnow dot com
main/fopen_wrappers.c
patch
|
blob
|
history
diff --git
a/main/fopen_wrappers.c
b/main/fopen_wrappers.c
index f7bd5107e135b6e7ce70f53e5236ff446d969a7c..70ae44265520c282b5f17af6f5804c0d8cf27afc 100644
(file)
--- a/
main/fopen_wrappers.c
+++ b/
main/fopen_wrappers.c
@@
-435,8
+435,8
@@
PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC)
}
} else
#endif
- if (PG(doc_root) && path_info && (length = strlen(PG(doc_root)) &&
- IS_ABSOLUTE_PATH(PG(doc_root), length))
)
{
+ if (PG(doc_root) && path_info && (length = strlen(PG(doc_root))
)
&&
+ IS_ABSOLUTE_PATH(PG(doc_root), length)) {
filename = emalloc(length + strlen(path_info) + 2);
if (filename) {
memcpy(filename, PG(doc_root), length);