diff --git a/tools/Dockerfile b/tools/Dockerfile index 8122b335..be0d1dbf 100644 --- a/tools/Dockerfile +++ b/tools/Dockerfile @@ -18,11 +18,11 @@ RUN sed -i 's/archive.ubuntu.com/'$ubuntu_mirror'/g' /etc/apt/sources.list && \ # install mysql RUN DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server && \ - sed -i -e "s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/mysql.conf.d/mysqld.cnf && \ +# sed -i -e "s/^bind-address\s*=\s*127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/mysql.conf.d/mysqld.cnf && \ sed -i 's/^\(log_error\s.*\)/# \1/' /etc/mysql/my.cnf && \ echo "mysqld_safe &" > /tmp/mysql_config && \ echo "mysqladmin --silent --wait=30 ping || exit 1" >> /tmp/mysql_config && \ - echo "mysql -e 'GRANT ALL PRIVILEGES ON *.* TO \"root\"@\"%\" IDENTIFIED BY \"123456\" WITH GRANT OPTION;'" >> /tmp/mysql_config && \ + echo "mysql -e \"GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '123456' WITH GRANT OPTION;\"" >> /tmp/mysql_config && \ bash /tmp/mysql_config && \ rm -f /tmp/mysql_config @@ -50,7 +50,7 @@ RUN mkdir /php && cd /php && \ echo "date.timezone="$php_timezone >> /php/etc/php.ini && \ sed -i 's/error_reporting = /#error_reporting = /g' /php/etc/php.ini && \ sed -i 's/display_errors = /#display_errors = /g' /php/etc/php.ini && \ - sed -i -e 's/pdo_mysql.default_socket\s*=/pdo_mysql.default_socket = /var/run/mysqld/mysqld.sock/g' /php/etc/php.ini && \ + sed -i 's/pdo_mysql.default_socket\s*=/pdo_mysql.default_socket = \/var\/run\/mysqld\/mysqld.sock/g' /php/etc/php.ini && \ echo "always_populate_raw_post_data=-1" >> /php/etc/php.ini && \ echo "error_reporting=E_ALL" >> /php/etc/php.ini && \ echo "display_errors=On" >> /php/etc/php.ini && \ diff --git a/var/Typecho/Common.php b/var/Typecho/Common.php index e631ec1f..da30eee3 100644 --- a/var/Typecho/Common.php +++ b/var/Typecho/Common.php @@ -229,10 +229,10 @@ class Typecho_Common * 异常截获函数 * * @access public - * @param Exception $exception 截获的异常 + * @param $exception 截获的异常 * @return void */ - public static function exceptionHandle(Exception $exception) + public static function exceptionHandle($exception) { @ob_end_clean(); diff --git a/var/Typecho/Request.php b/var/Typecho/Request.php index b4bfe2fc..49f46873 100644 --- a/var/Typecho/Request.php +++ b/var/Typecho/Request.php @@ -222,8 +222,7 @@ class Typecho_Request self::$_urlPrefix == __TYPECHO_URL_PREFIX__; } else { self::$_urlPrefix = (self::isSecure() ? 'https' : 'http') . '://' - . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'] - . (empty($_SERVER['SERVER_PORT']) || in_array($_SERVER['SERVER_PORT'], array(80, 443)) ? '' : ':' . $_SERVER['SERVER_PORT'])); + . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']); } }