kashire/lainchan
4
0
Fork 0
Code Issues 18 Pull Requests Releases Wiki Activity

Bugfix: purge() while in CLI-mode

Browse Source
This commit is contained in:
Michael Save 2012-04-19 23:07:52 +10:00
parent 5c9fcfc50e
commit d86875a3b9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
inc/functions.php
View File

@ -335,6 +335,7 @@ function boardTitle($uri) {
function purge($uri) { function purge($uri) {
global $config, $debug; global $config, $debug;
if (preg_match($config['referer_match'], $config['root'])) { if (preg_match($config['referer_match'], $config['root'])) {
$uri = (str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) == '/' ? '/' : str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) . '/') . $uri; $uri = (str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) == '/' ? '/' : str_replace('\\', '/', dirname($_SERVER['REQUEST_URI'])) . '/') . $uri;
} else { } else {
@ -348,7 +349,7 @@ function purge($uri) {
foreach ($config['purge'] as &$purge) { foreach ($config['purge'] as &$purge) {
$host = &$purge[0]; $host = &$purge[0];
$port = &$purge[1]; $port = &$purge[1];
$http_host = isset($purge[2]) ? $purge[2] : $_SERVER['HTTP_HOST']; $http_host = isset($purge[2]) ? $purge[2] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost');
$request = "PURGE {$uri} HTTP/1.1\r\nHost: {$http_host}\r\nUser-Agent: Tinyboard\r\nConnection: Close\r\n\r\n"; $request = "PURGE {$uri} HTTP/1.1\r\nHost: {$http_host}\r\nUser-Agent: Tinyboard\r\nConnection: Close\r\n\r\n";
if ($fp = fsockopen($host, $port, $errno, $errstr, $config['purge_timeout'])) { if ($fp = fsockopen($host, $port, $errno, $errstr, $config['purge_timeout'])) {
fwrite($fp, $request); fwrite($fp, $request);
@ -399,7 +400,7 @@ function file_write($path, $data, $simple = false, $skip_purge = false) {
if (!fclose($fp)) if (!fclose($fp))
error('Unable to close file: ' . $path); error('Unable to close file: ' . $path);
if (!$skip_purge && isset($config['purge']) && isset($_SERVER['HTTP_HOST'])) { if (!$skip_purge && isset($config['purge'])) {
// Purge cache // Purge cache
if (basename($path) == $config['file_index']) { if (basename($path) == $config['file_index']) {
// Index file (/index.html); purge "/" as well // Index file (/index.html); purge "/" as well