summaryrefslogtreecommitdiff
path: root/ext/standard/url.c
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2012-08-19 14:50:52 -0300
committerFelipe Pena <felipensp@gmail.com>2012-08-19 14:50:52 -0300
commitd6e6db4501254524ad442f68e760ad975f083476 (patch)
treef3163922f2fc16d29ed61cae6bf3932d490de3cb /ext/standard/url.c
parent9d8d84ebdf8f59ecd6a256f5195fba8e877e611d (diff)
parent3dd256a67b61a995b580cce762a46be689ea34b1 (diff)
downloadphp-git-d6e6db4501254524ad442f68e760ad975f083476.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: - Value stored to var is never used
Diffstat (limited to 'ext/standard/url.c')
-rw-r--r--ext/standard/url.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 8489f42091..0555c7b65a 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -220,14 +220,14 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
if (query && fragment) {
if (query > fragment) {
- p = e = fragment;
+ e = fragment;
} else {
- p = e = query;
+ e = query;
}
} else if (query) {
- p = e = query;
+ e = query;
} else if (fragment) {
- p = e = fragment;
+ e = fragment;
}
} else {
e = p;