mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-03-19 01:19:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:typecho/typecho

Browse Source
This commit is contained in:
joyqi 2017-01-04 10:24:48 +08:00
commit 42eb5c4744
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/Dockerfile
View File

@ -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 && \

4
var/Typecho/Common.php
View File

@ -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();

3
var/Typecho/Request.php
View File

@ -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']);
}
}