Merge branch 'master' into fixsomebuilds

Author: James Nesbitt

lampstackplus/Dockerfile

@@ -97,6 +97,7 @@ ADD etc/php-fpm.conf /etc/php-fpm.conf
 ADD etc/php-fpm.d/www.conf /etc/php-fpm.d/www.conf
 
 # Add some php extension configuraiton overrides
+ADD etc/php.d/01-defaultdatetime.ini /etc/php.d/01-defaultdatetime.ini
 ADD etc/php.d/40-apcu.ini /etc/php.d/40-apcu.ini
 
 # Start the PHP-FPM service, and expose the 9000 port for TCP connections

lampstackplus/etc/php.d/01-defaultdatetime.ini

@@ -0,0 +1,5 @@
+[Date]
+
+; Defines the default timezone used by the date functions
+; http://php.net/date.timezone
+date.timezone = "UTC"

php56fpm/etc/php-fpm.d/www.conf

@@ -153,7 +153,7 @@ pm.max_spare_servers = 35
 ; The log file for slow requests
 ; Default Value: not set
 ; Note: slowlog is mandatory if request_slowlog_timeout is set
-slowlog = /var/log/php-fpm/www-slow.log
+slowlog = /app/log/php-fpm/www-slow.log
 
 ; Set open file descriptor rlimit.
 ; Default Value: system defined value

php56fpm/etc/php.ini

@@ -892,7 +892,6 @@ cli_server.color = On
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
 ;date.timezone =
-date.timezone = "UTC"
 
 ; http://php.net/date.default-latitude
 ;date.default_latitude = 31.7667

platformsh/Dockerfile

@@ -64,4 +64,4 @@ ENV PLATFORMSH_CLI_DISABLE_CACHE=0
 ENTRYPOINT ["/app/.composer/vendor/bin/platform"]
 CMD ["--shell"]
 
-### /PLATFORMSH ---------------------------------------------------------------
+### /PLATFORMSH ---------------------------------------------------------------