Fixup HTTPRequest.class.php … again

This fixes up commit 63f9ff4e0efc619ab8851463bbafe8f44eb72a89 and
d3ee6dcbc3f4cb62026e9c087561ae878572e096.

diff --git a/wcfsetup/install/files/lib/util/HTTPRequest.class.php b/wcfsetup/install/files/lib/util/HTTPRequest.class.php
index 5853c0b7f35059bf5a3fe4c3afbfcb7a64e49a9b..ff7452228986657f6de5328738001552d2047625 100644 (file)
--- a/wcfsetup/install/files/lib/util/HTTPRequest.class.php
+++ b/wcfsetup/install/files/lib/util/HTTPRequest.class.php
@@ -226,9 +226,11 @@ final class HTTPRequest {
                
                if (PROXY_SERVER_HTTP && !$this->originUseSSL) {
                        $this->path = $url;
+                       $this->query = '';
                }
                else {
                        $this->path = isset($parsedUrl['path']) ? $parsedUrl['path'] : '/';
+                       $this->query = isset($parsedUrl['query']) ? $parsedUrl['query'] : '';
                }
                
                if (PROXY_SERVER_HTTP) {
@@ -238,7 +240,6 @@ final class HTTPRequest {
                $this->useSSL = $parsedUrl['scheme'] === 'https';
                $this->host = $parsedUrl['host'];
                $this->port = isset($parsedUrl['port']) ? $parsedUrl['port'] : ($this->useSSL ? 443 : 80);
-               $this->query = isset($parsedUrl['query']) ? $parsedUrl['query'] : '';
                
                // update the 'Host:' header if URL has changed
                if ($this->url != $url) {