TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'DM42-20230717-fixfatalerron304' into 'dev'

Browse Source 
Skip logging when DB functions are not yet loaded (logging requires db lookup).

See merge request hubzilla/core!2051
This commit is contained in:
Mario
2023-07-18 11:12:11 +00:00
parent c412c01a65 ba2d775215
commit da1ccc620b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@@ -949,7 +949,7 @@ class App {
$staticfilecwd = getcwd();
$staticfilerealpath = realpath(self::$cmd);
if (strpos($staticfilerealpath, $staticfilecwd) !== 0) {
http_status_exit(404, 'not found');
http_status_exit(404, 'not found', 1);
}
$staticfileetag = '"' . md5($staticfilerealpath . filemtime(self::$cmd)) . '"';
@@ -959,7 +959,7 @@ class App {
// If HTTP_IF_NONE_MATCH is same as the generated ETag => content is the same as browser cache
// So send a 304 Not Modified response header and exit
if ($_SERVER['HTTP_IF_NONE_MATCH'] == $staticfileetag) {
http_status_exit(304, 'not modified');
http_status_exit(304, 'not modified', 1);
}
}
header("Content-type: " . $serve_rawfiles[$filext]);

9
include/network.php
View File

@@ -456,13 +456,14 @@ function as_return_and_die($obj,$channel) {
* @param string $msg
* optional message
*/
function http_status($val, $msg = '') {
function http_status($val, $msg = '',$skiplog = 0) {
if ($val >= 400)
$msg = (($msg) ? $msg : 'Error');
if ($val >= 200 && $val < 300)
$msg = (($msg) ? $msg : 'OK');
logger(\App::$query_string . ':' . $val . ' ' . $msg);
if (!$skiplog)
logger(\App::$query_string . ':' . $val . ' ' . $msg);
header($_SERVER['SERVER_PROTOCOL'] . ' ' . $val . ' ' . $msg);
}
@@ -476,8 +477,8 @@ function http_status($val, $msg = '') {
* optional message
* @return void does not return, process is terminated
*/
function http_status_exit($val, $msg = '') {
http_status($val, $msg);
function http_status_exit($val, $msg = '',$skiplog = 0) {
http_status($val, $msg, $skiplog);
killme();
}