|
@@ -97,9 +97,9 @@ discard block |
|
|
block discarded – undo |
|
97
|
97
|
$domain = filter_input(INPUT_SERVER, 'SERVER_NAME', FILTER_SANITIZE_STRING); |
|
98
|
98
|
$port = filter_input(INPUT_SERVER, 'SERVER_PORT', FILTER_SANITIZE_STRING); |
|
99
|
99
|
if ($this->model->getConfig()->getTrustProxyHeaders()) { |
|
100
|
|
- $domain = filter_input(INPUT_SERVER, 'HTTP_X_FORWARDED_HOST', FILTER_SANITIZE_STRING) ?: $domain ; |
|
101
|
|
- $protocol = filter_input(INPUT_SERVER, 'HTTP_X_FORWARDED_PROTO', FILTER_SANITIZE_STRING) ?: $protocol ; |
|
102
|
|
- $port = filter_input(INPUT_SERVER, 'HTTP_X_FORWARDED_PORT', FILTER_SANITIZE_STRING) ?: $port ; |
|
|
100
|
+ $domain = filter_input(INPUT_SERVER, 'HTTP_X_FORWARDED_HOST', FILTER_SANITIZE_STRING) ?: $domain; |
|
|
101
|
+ $protocol = filter_input(INPUT_SERVER, 'HTTP_X_FORWARDED_PROTO', FILTER_SANITIZE_STRING) ?: $protocol; |
|
|
102
|
+ $port = filter_input(INPUT_SERVER, 'HTTP_X_FORWARDED_PORT', FILTER_SANITIZE_STRING) ?: $port; |
|
103
|
103
|
} |
|
104
|
104
|
$disp_port = ($port == 80 || $port == 443) ? '' : ":$port"; |
|
105
|
105
|
$full_url = "$protocol://{$domain}{$disp_port}{$base_url}"; |
|
@@ -142,7 +142,7 @@ discard block |
|
|
block discarded – undo |
|
142
|
142
|
{ |
|
143
|
143
|
if ($modifiedDate) { |
|
144
|
144
|
$ifModifiedSince = $this->getIfModifiedSince(); |
|
145
|
|
- $this->sendHeader("Last-Modified: " . $modifiedDate->format('Y-m-d H:i:s')); |
|
|
145
|
+ $this->sendHeader("Last-Modified: ".$modifiedDate->format('Y-m-d H:i:s')); |
|
146
|
146
|
if (!is_null($ifModifiedSince) && $ifModifiedSince >= $modifiedDate) { |
|
147
|
147
|
$this->sendHeader("HTTP/1.0 304 Not Modified"); |
|
148
|
148
|
return true; |
NatLibFi /
Skosmos
