From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 24 Sep 2015 19:24:05 +0000 (+0200)
Subject: Fixup HTTPRequest.class.php … again
X-Git-Tag: 2.1.8~37
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d50541dd239cb4c732db151942ba3186aa21577;p=GitHub%2FWoltLab%2FWCF.git

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 5853c0b7f3..ff74522289 100644
--- 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) {