From 2fe40edfc5ccec83e8fe68a95a17240e38aa2091 Mon Sep 17 00:00:00 2001 From: thisgun Date: Mon, 30 Sep 2019 17:35:36 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=84=A4=EC=B9=98=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EC=A4=91=20=EB=AC=B8=EC=9E=90=EC=97=B4?= =?UTF-8?q?=EC=9D=84=20=EC=83=81=EC=88=98=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install_db.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install_db.php b/install/install_db.php index 71e21fa95..21b70baa6 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -282,7 +282,7 @@ for ($i=0; $i Date: Thu, 31 Oct 2019 12:17:41 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=8A=B9=EC=A0=95=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=97=90=EC=84=9C=20chroot=20=EA=B2=BD=EB=A1=9C=EB=A5=BC=20?= =?UTF-8?q?=EC=B9=98=ED=99=98=ED=95=98=EC=A7=80=20=EB=AA=BB=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.php b/common.php index 542a80dae..b95ef4ba3 100644 --- a/common.php +++ b/common.php @@ -35,7 +35,7 @@ function g5_path() $server_script_filename = preg_replace('/\/+/', '/', str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME'])); $tilde_remove = preg_replace('/^\/\~[^\/]+(.*)$/', '$1', $server_script_name); $document_root = str_replace($tilde_remove, '', $server_script_filename); - $pattern = '/' . preg_quote($document_root, '/') . '/i'; + $pattern = '/.*?' . preg_quote($document_root, '/') . '/i'; $root = preg_replace($pattern, '', $result['path']); $port = ($_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443) ? '' : ':'.$_SERVER['SERVER_PORT']; $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') ? 's' : '') . '://';