Toshaan Bharvani
6 months ago
commit
63e5d64478
15 changed files with 7010 additions and 0 deletions
@ -0,0 +1,158 @@ |
|||||||
|
; Enable Zend OPcache extension module |
||||||
|
zend_extension=opcache |
||||||
|
|
||||||
|
; Determines if Zend OPCache is enabled |
||||||
|
opcache.enable=1 |
||||||
|
|
||||||
|
; Determines if Zend OPCache is enabled for the CLI version of PHP |
||||||
|
opcache.enable_cli=1 |
||||||
|
|
||||||
|
; The OPcache shared memory storage size. |
||||||
|
;opcache.memory_consumption=128 |
||||||
|
|
||||||
|
; The amount of memory for interned strings in Mbytes. |
||||||
|
;opcache.interned_strings_buffer=8 |
||||||
|
|
||||||
|
; The maximum number of keys (scripts) in the OPcache hash table. |
||||||
|
; Only numbers between 200 and 1000000 are allowed. |
||||||
|
;opcache.max_accelerated_files=10000 |
||||||
|
|
||||||
|
; The maximum percentage of "wasted" memory until a restart is scheduled. |
||||||
|
;opcache.max_wasted_percentage=5 |
||||||
|
|
||||||
|
; When this directive is enabled, the OPcache appends the current working |
||||||
|
; directory to the script key, thus eliminating possible collisions between |
||||||
|
; files with the same name (basename). Disabling the directive improves |
||||||
|
; performance, but may break existing applications. |
||||||
|
;opcache.use_cwd=1 |
||||||
|
|
||||||
|
; When disabled, you must reset the OPcache manually or restart the |
||||||
|
; webserver for changes to the filesystem to take effect. |
||||||
|
;opcache.validate_timestamps=1 |
||||||
|
|
||||||
|
; How often (in seconds) to check file timestamps for changes to the shared |
||||||
|
; memory storage allocation. ("1" means validate once per second, but only |
||||||
|
; once per request. "0" means always validate) |
||||||
|
;opcache.revalidate_freq=2 |
||||||
|
|
||||||
|
; Enables or disables file search in include_path optimization |
||||||
|
;opcache.revalidate_path=0 |
||||||
|
|
||||||
|
; If disabled, all PHPDoc comments are dropped from the code to reduce the |
||||||
|
; size of the optimized code. |
||||||
|
;opcache.save_comments=1 |
||||||
|
|
||||||
|
; If enabled, compilation warnings (including notices and deprecations) will |
||||||
|
; be recorded and replayed each time a file is included. Otherwise, compilation |
||||||
|
; warnings will only be emitted when the file is first cached. |
||||||
|
;opcache.record_warnings=0 |
||||||
|
|
||||||
|
; Allow file existence override (file_exists, etc.) performance feature. |
||||||
|
;opcache.enable_file_override=0 |
||||||
|
|
||||||
|
; A bitmask, where each bit enables or disables the appropriate OPcache |
||||||
|
; passes |
||||||
|
;opcache.optimization_level=0x7FFFBFFF |
||||||
|
|
||||||
|
; This hack should only be enabled to work around "Cannot redeclare class" |
||||||
|
; errors. |
||||||
|
;opcache.dups_fix=0 |
||||||
|
|
||||||
|
; The location of the OPcache blacklist file (wildcards allowed). |
||||||
|
; Each OPcache blacklist file is a text file that holds the names of files |
||||||
|
; that should not be accelerated. |
||||||
|
opcache.blacklist_filename=/etc/php.d/opcache*.blacklist |
||||||
|
|
||||||
|
; Allows exclusion of large files from being cached. By default all files |
||||||
|
; are cached. |
||||||
|
;opcache.max_file_size=0 |
||||||
|
|
||||||
|
; Check the cache checksum each N requests. |
||||||
|
; The default value of "0" means that the checks are disabled. |
||||||
|
;opcache.consistency_checks=0 |
||||||
|
|
||||||
|
; How long to wait (in seconds) for a scheduled restart to begin if the cache |
||||||
|
; is not being accessed. |
||||||
|
;opcache.force_restart_timeout=180 |
||||||
|
|
||||||
|
; OPcache error_log file name. Empty string assumes "stderr". |
||||||
|
;opcache.error_log= |
||||||
|
|
||||||
|
; All OPcache errors go to the Web server log. |
||||||
|
; By default, only fatal errors (level 0) or errors (level 1) are logged. |
||||||
|
; You can also enable warnings (level 2), info messages (level 3) or |
||||||
|
; debug messages (level 4). |
||||||
|
;opcache.log_verbosity_level=1 |
||||||
|
|
||||||
|
; Preferred Shared Memory back-end. Leave empty and let the system decide. |
||||||
|
;opcache.preferred_memory_model= |
||||||
|
|
||||||
|
; Protect the shared memory from unexpected writing during script execution. |
||||||
|
; Useful for internal debugging only. |
||||||
|
;opcache.protect_memory=0 |
||||||
|
|
||||||
|
; Allows calling OPcache API functions only from PHP scripts which path is |
||||||
|
; started from specified string. The default "" means no restriction |
||||||
|
;opcache.restrict_api= |
||||||
|
|
||||||
|
; Enables and sets the second level cache directory. |
||||||
|
; It should improve performance when SHM memory is full, at server restart or |
||||||
|
; SHM reset. The default "" disables file based caching. |
||||||
|
; RPM note : file cache directory must be owned by process owner |
||||||
|
; for mod_php, see /etc/httpd/conf.d/php.conf |
||||||
|
; for php-fpm, see /etc/php-fpm.d/*conf |
||||||
|
;opcache.file_cache= |
||||||
|
|
||||||
|
; Enables or disables opcode caching in shared memory. |
||||||
|
;opcache.file_cache_only=0 |
||||||
|
|
||||||
|
; Enables or disables checksum validation when script loaded from file cache. |
||||||
|
;opcache.file_cache_consistency_checks=1 |
||||||
|
|
||||||
|
; Implies opcache.file_cache_only=1 for a certain process that failed to |
||||||
|
; reattach to the shared memory (for Windows only). Explicitly enabled file |
||||||
|
; cache is required. |
||||||
|
;opcache.file_cache_fallback=1 |
||||||
|
|
||||||
|
; Enables or disables copying of PHP code (text segment) into HUGE PAGES. |
||||||
|
; Under certain circumstances (if only a single global PHP process is |
||||||
|
; started from which all others fork), this can increase performance |
||||||
|
; by a tiny amount because TLB misses are reduced. On the other hand, this |
||||||
|
; delays PHP startup, increases memory usage and degrades performance |
||||||
|
; under memory pressure - use with care. |
||||||
|
; Requires appropriate OS configuration. |
||||||
|
opcache.huge_code_pages=0 |
||||||
|
|
||||||
|
; Validate cached file permissions. |
||||||
|
; Leads OPcache to check file readability on each access to cached file. |
||||||
|
; This directive should be enabled in shared hosting environment, when few |
||||||
|
; users (PHP-FPM pools) reuse the common OPcache shared memory. |
||||||
|
;opcache.validate_permission=0 |
||||||
|
|
||||||
|
; Prevent name collisions in chroot'ed environment. |
||||||
|
; This directive prevents file name collisions in different "chroot" |
||||||
|
; environments. It should be enabled for sites that may serve requests in |
||||||
|
; different "chroot" environments. |
||||||
|
;opcache.validate_root=0 |
||||||
|
|
||||||
|
; If specified, it produces opcode dumps for debugging different stages of |
||||||
|
; optimizations. |
||||||
|
;opcache.opt_debug_level=0 |
||||||
|
|
||||||
|
; Specifies a PHP script that is going to be compiled and executed at server |
||||||
|
; start-up. |
||||||
|
; https://php.net/opcache.preload |
||||||
|
;opcache.preload= |
||||||
|
|
||||||
|
; Preloading code as root is not allowed for security reasons. This directive |
||||||
|
; facilitates to let the preloading to be run as another user. |
||||||
|
; https://php.net/opcache.preload_user |
||||||
|
;opcache.preload_user= |
||||||
|
|
||||||
|
; Prevents caching files that are less than this number of seconds old. It |
||||||
|
; protects from caching of incompletely updated files. In case all file updates |
||||||
|
; on your site are atomic, you may increase performance by setting it to "0". |
||||||
|
;opcache.file_update_protection=2 |
||||||
|
|
||||||
|
; Absolute path used to store shared lockfiles (for *nix only). |
||||||
|
;opcache.lockfile_path=/tmp |
@ -0,0 +1,6 @@ |
|||||||
|
# PHP-FPM FastCGI server |
||||||
|
# network or unix domain socket configuration |
||||||
|
|
||||||
|
upstream php-fpm { |
||||||
|
server unix:/run/php-fpm/www.sock; |
||||||
|
} |
@ -0,0 +1,16 @@ |
|||||||
|
# pass the PHP scripts to FastCGI server |
||||||
|
# |
||||||
|
# See conf.d/php-fpm.conf for socket configuration |
||||||
|
# |
||||||
|
index index.php index.html index.htm; |
||||||
|
|
||||||
|
location ~ \.(php|phar)(/.*)?$ { |
||||||
|
fastcgi_split_path_info ^(.+\.(?:php|phar))(/.*)$; |
||||||
|
|
||||||
|
fastcgi_intercept_errors on; |
||||||
|
fastcgi_index index.php; |
||||||
|
include fastcgi_params; |
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; |
||||||
|
fastcgi_param PATH_INFO $fastcgi_path_info; |
||||||
|
fastcgi_pass php-fpm; |
||||||
|
} |
@ -0,0 +1,11 @@ |
|||||||
|
--- php-7.2.0/configure.ac.includedir |
||||||
|
+++ php-7.2.0/configure.ac |
||||||
|
@@ -1230,7 +1230,7 @@ |
||||||
|
EXPANDED_DATADIR=$datadir |
||||||
|
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` |
||||||
|
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` |
||||||
|
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR |
||||||
|
+INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php |
||||||
|
|
||||||
|
exec_prefix=$old_exec_prefix |
||||||
|
libdir=$old_libdir |
@ -0,0 +1,98 @@ |
|||||||
|
diff -up ./ext/date/tests/bug33414-2.phpt.datetests ./ext/date/tests/bug33414-2.phpt |
||||||
|
--- ./ext/date/tests/bug33414-2.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/date/tests/bug33414-2.phpt 2020-04-09 14:40:00.809433489 +0200 |
||||||
|
@@ -74,10 +74,10 @@ $strtotime_tstamp = strtotime("next Frid |
||||||
|
print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; |
||||||
|
print "wanted=Friday 00:00:00\n\n"; |
||||||
|
?> |
||||||
|
---EXPECT-- |
||||||
|
+--EXPECTF-- |
||||||
|
TZ=Pacific/Rarotonga - wrong day. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -1030 0 |
||||||
|
-result=Tuesday 1970-01-06 00:00:00 -1030 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Tuesday 1970-01-06 00:00:00 %s |
||||||
|
wanted=Tuesday 00:00:00 |
||||||
|
|
||||||
|
TZ=Atlantic/South_Georgia - wrong day. |
||||||
|
@@ -91,13 +91,13 @@ result=Monday 2005-04-04 00:00:00 EDT 1 |
||||||
|
wanted=Monday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Enderbury - wrong day, off by 2 days. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -12 0 |
||||||
|
-result=Monday 1970-01-05 00:00:00 -12 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Monday 1970-01-05 00:00:00 %s |
||||||
|
wanted=Monday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Kiritimati - wrong day, off by 2 days. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -1040 0 |
||||||
|
-result=Monday 1970-01-05 00:00:00 -1040 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Monday 1970-01-05 00:00:00 %s |
||||||
|
wanted=Monday 00:00:00 |
||||||
|
|
||||||
|
TZ=America/Managua - wrong day. |
||||||
|
@@ -106,13 +106,13 @@ result=Tuesday 2005-04-12 00:00:00 CDT 1 |
||||||
|
wanted=Tuesday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Pitcairn - wrong day. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -0830 0 |
||||||
|
-result=Wednesday 1970-01-07 00:00:00 -0830 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Wednesday 1970-01-07 00:00:00 %s |
||||||
|
wanted=Wednesday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Fakaofo - wrong day. |
||||||
|
-tStamp=Thursday 1970-01-01 17:17:17 -11 0 |
||||||
|
-result=Saturday 1970-01-03 00:00:00 -11 0 |
||||||
|
+tStamp=Thursday 1970-01-01 17:17:17 %s |
||||||
|
+result=Saturday 1970-01-03 00:00:00 %s |
||||||
|
wanted=Saturday 00:00:00 |
||||||
|
|
||||||
|
TZ=Pacific/Johnston - wrong day. |
||||||
|
diff -up ./ext/date/tests/bug66985.phpt.datetests ./ext/date/tests/bug66985.phpt |
||||||
|
--- ./ext/date/tests/bug66985.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/date/tests/bug66985.phpt 2020-04-09 14:40:37.099288185 +0200 |
||||||
|
@@ -3,7 +3,7 @@ Bug #66985 (Some timezones are no longer |
||||||
|
--FILE-- |
||||||
|
<?php |
||||||
|
$zones = array( |
||||||
|
- "CST6CDT", "Cuba", "Egypt", "Eire", "EST5EDT", "Factory", "GB-Eire", |
||||||
|
+ "CST6CDT", "Cuba", "Egypt", "Eire", "EST5EDT", "GB-Eire", |
||||||
|
"GMT0", "Greenwich", "Hongkong", "Iceland", "Iran", "Israel", "Jamaica", |
||||||
|
"Japan", "Kwajalein", "Libya", "MST7MDT", "Navajo", "NZ-CHAT", "Poland", |
||||||
|
"Portugal", "PST8PDT", "Singapore", "Turkey", "Universal", "W-SU", |
||||||
|
@@ -45,11 +45,6 @@ DateTimeZone Object |
||||||
|
) |
||||||
|
DateTimeZone Object |
||||||
|
( |
||||||
|
- [timezone_type] => 3 |
||||||
|
- [timezone] => Factory |
||||||
|
-) |
||||||
|
-DateTimeZone Object |
||||||
|
-( |
||||||
|
[timezone_type] => 3 |
||||||
|
[timezone] => GB-Eire |
||||||
|
) |
||||||
|
diff -up ./ext/date/tests/strtotime3-64bit.phpt.datetests ./ext/date/tests/strtotime3-64bit.phpt |
||||||
|
--- ./ext/date/tests/strtotime3-64bit.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/date/tests/strtotime3-64bit.phpt 2020-04-09 14:40:00.809433489 +0200 |
||||||
|
@@ -44,7 +44,7 @@ foreach ($strs as $str) { |
||||||
|
} |
||||||
|
|
||||||
|
?> |
||||||
|
---EXPECT-- |
||||||
|
+--EXPECTF-- |
||||||
|
bool(false) |
||||||
|
bool(false) |
||||||
|
string(31) "Thu, 15 Jun 2006 00:00:00 +0100" |
||||||
|
@@ -53,7 +53,7 @@ bool(false) |
||||||
|
string(31) "Fri, 16 Jun 2006 23:49:12 +0100" |
||||||
|
bool(false) |
||||||
|
string(31) "Fri, 16 Jun 2006 02:22:00 +0100" |
||||||
|
-string(31) "Sun, 16 Jun 0222 02:22:00 -0036" |
||||||
|
+string(31) "Sun, 16 Jun 0222 02:22:00 %s" |
||||||
|
string(31) "Fri, 16 Jun 2006 02:22:33 +0100" |
||||||
|
bool(false) |
||||||
|
string(31) "Tue, 02 Mar 2004 00:00:00 +0000" |
@ -0,0 +1,27 @@ |
|||||||
|
Disable MPM detection |
||||||
|
|
||||||
|
mod_php is build twice |
||||||
|
- as NTS without option |
||||||
|
- as ZTS using --enable-maintainer-zts |
||||||
|
|
||||||
|
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 |
||||||
|
--- a/sapi/apache2handler/config.m4 |
||||||
|
+++ b/sapi/apache2handler/config.m4 |
||||||
|
@@ -105,17 +105,6 @@ if test "$PHP_APXS2" != "no"; then |
||||||
|
;; |
||||||
|
esac |
||||||
|
|
||||||
|
- if test "$APACHE_VERSION" -lt 2004001; then |
||||||
|
- APXS_MPM=`$APXS -q MPM_NAME` |
||||||
|
- if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then |
||||||
|
- PHP_BUILD_THREAD_SAFE |
||||||
|
- fi |
||||||
|
- else |
||||||
|
- APACHE_THREADED_MPM=`$APXS_HTTPD -V 2>/dev/null | grep 'threaded:.*yes'` |
||||||
|
- if test -n "$APACHE_THREADED_MPM"; then |
||||||
|
- PHP_BUILD_THREAD_SAFE |
||||||
|
- fi |
||||||
|
- fi |
||||||
|
AC_MSG_RESULT(yes) |
||||||
|
PHP_SUBST(APXS) |
||||||
|
else |
@ -0,0 +1,25 @@ |
|||||||
|
diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4 |
||||||
|
--- ./sapi/embed/config.m4.embed 2020-07-07 13:51:05.879764972 +0200 |
||||||
|
+++ ./sapi/embed/config.m4 2020-07-07 13:52:50.128412148 +0200 |
||||||
|
@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then |
||||||
|
yes|shared) |
||||||
|
LIBPHP_CFLAGS="-shared" |
||||||
|
PHP_EMBED_TYPE=shared |
||||||
|
- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" |
||||||
|
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)" |
||||||
|
+ INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)" |
||||||
|
;; |
||||||
|
static) |
||||||
|
LIBPHP_CFLAGS="-static" |
||||||
|
diff -up ./scripts/php-config.in.embed ./scripts/php-config.in |
||||||
|
--- ./scripts/php-config.in.embed 2020-07-07 12:54:42.000000000 +0200 |
||||||
|
+++ ./scripts/php-config.in 2020-07-07 13:51:05.880764968 +0200 |
||||||
|
@@ -18,7 +18,7 @@ exe_extension="@EXEEXT@" |
||||||
|
php_cli_binary=NONE |
||||||
|
php_cgi_binary=NONE |
||||||
|
configure_options="@CONFIGURE_OPTIONS@" |
||||||
|
-php_sapis="@PHP_INSTALLED_SAPIS@" |
||||||
|
+php_sapis="apache2handler litespeed fpm phpdbg @PHP_INSTALLED_SAPIS@" |
||||||
|
ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@" |
||||||
|
ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@" |
||||||
|
|
@ -0,0 +1,92 @@ |
|||||||
|
diff -up ./ext/dba/config.m4.libdb ./ext/dba/config.m4 |
||||||
|
--- ./ext/dba/config.m4.libdb 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/dba/config.m4 2020-04-09 14:35:08.208605065 +0200 |
||||||
|
@@ -375,61 +375,13 @@ if test "$PHP_DB4" != "no"; then |
||||||
|
dbdp4="/usr/local/BerkeleyDB.4." |
||||||
|
dbdp5="/usr/local/BerkeleyDB.5." |
||||||
|
for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do |
||||||
|
- if test -f "$i/db5/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/db5/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/db4/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/db4/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.3/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.3/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.1/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.1/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db5.0/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db5.0/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.8/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.8/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.7/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.7/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.6/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.6/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.5/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.5/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4/db.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4/db.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db/db4.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db/db4.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db4.h"; then |
||||||
|
- THIS_PREFIX=$i |
||||||
|
- THIS_INCLUDE=$i/include/db4.h |
||||||
|
- break |
||||||
|
- elif test -f "$i/include/db.h"; then |
||||||
|
+ if test -f "$i/include/db.h"; then |
||||||
|
THIS_PREFIX=$i |
||||||
|
THIS_INCLUDE=$i/include/db.h |
||||||
|
break |
||||||
|
fi |
||||||
|
done |
||||||
|
- PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
||||||
|
+ PHP_DBA_DB_CHECK(4, db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) |
||||||
|
fi |
||||||
|
PHP_DBA_STD_RESULT(db4,Berkeley DB4) |
||||||
|
|
||||||
|
diff -up ./ext/dba/dba.c.libdb ./ext/dba/dba.c |
||||||
|
--- ./ext/dba/dba.c.libdb 2020-04-09 14:06:11.000000000 +0200 |
||||||
|
+++ ./ext/dba/dba.c 2020-04-09 14:36:30.593275190 +0200 |
||||||
|
@@ -50,6 +50,10 @@ |
||||||
|
#include "php_lmdb.h" |
||||||
|
#include "dba_arginfo.h" |
||||||
|
|
||||||
|
+#ifdef DB4_INCLUDE_FILE |
||||||
|
+#include DB4_INCLUDE_FILE |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
PHP_MINIT_FUNCTION(dba); |
||||||
|
PHP_MSHUTDOWN_FUNCTION(dba); |
||||||
|
PHP_MINFO_FUNCTION(dba); |
||||||
|
@@ -452,6 +456,10 @@ PHP_MINFO_FUNCTION(dba) |
||||||
|
|
||||||
|
php_info_print_table_start(); |
||||||
|
php_info_print_table_row(2, "DBA support", "enabled"); |
||||||
|
+#ifdef DB_VERSION_STRING |
||||||
|
+ php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING); |
||||||
|
+ php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL)); |
||||||
|
+#endif |
||||||
|
if (handlers.s) { |
||||||
|
smart_str_0(&handlers); |
||||||
|
php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s)); |
@ -0,0 +1,746 @@ |
|||||||
|
# License: MIT |
||||||
|
# http://opensource.org/licenses/MIT |
||||||
|
|
||||||
|
Add support for use of the system timezone database, rather |
||||||
|
than embedding a copy. Discussed upstream but was not desired. |
||||||
|
|
||||||
|
History: |
||||||
|
f24: add internal UTC if tzdata is missing |
||||||
|
r23: fix possible buffer overflow |
||||||
|
r22: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi |
||||||
|
r21: adapt for timelib 2021.03 (in 8.1.0) |
||||||
|
r20: adapt for timelib 2020.03 (in 8.0.10RC1) |
||||||
|
r19: adapt for timelib 2020.02 (in 8.0.0beta2) |
||||||
|
r18: adapt for autotool change in 7.3.3RC1 |
||||||
|
r17: adapt for timelib 2018.01 (in 7.3.2RC1) |
||||||
|
r16: adapt for timelib 2017.06 (in 7.2.3RC1) |
||||||
|
r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1) |
||||||
|
r14: improve check for valid tz file |
||||||
|
r13: adapt for upstream changes to use PHP allocator |
||||||
|
r12: adapt for upstream changes for new zic |
||||||
|
r11: use canonical names to avoid more case sensitivity issues |
||||||
|
round lat/long from zone.tab towards zero per builtin db |
||||||
|
r10: make timezone case insensitive |
||||||
|
r9: fix another compile error without --with-system-tzdata configured (Michael Heimpold) |
||||||
|
r8: fix compile error without --with-system-tzdata configured |
||||||
|
r7: improve check for valid timezone id to exclude directories |
||||||
|
r6: fix fd leak in r5, fix country code/BC flag use in |
||||||
|
timezone_identifiers_list() using system db, |
||||||
|
fix use of PECL timezonedb to override system db, |
||||||
|
r5: reverts addition of "System/Localtime" fake tzname. |
||||||
|
updated for 5.3.0, parses zone.tab to pick up mapping between |
||||||
|
timezone name, country code and long/lat coords |
||||||
|
r4: added "System/Localtime" tzname which uses /etc/localtime |
||||||
|
r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) |
||||||
|
r2: add filesystem trawl to set up name alias index |
||||||
|
r1: initial revision |
||||||
|
|
||||||
|
|
||||||
|
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 |
||||||
|
index 6b803bf33e..53c3cdb3f4 100644 |
||||||
|
--- a/ext/date/config0.m4 |
||||||
|
+++ b/ext/date/config0.m4 |
||||||
|
@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h]) |
||||||
|
dnl Check for strtoll, atoll |
||||||
|
AC_CHECK_FUNCS(strtoll atoll) |
||||||
|
|
||||||
|
+PHP_ARG_WITH(system-tzdata, for use of system timezone data, |
||||||
|
+[ --with-system-tzdata[=DIR] to specify use of system timezone data], |
||||||
|
+no, no) |
||||||
|
+ |
||||||
|
+if test "$PHP_SYSTEM_TZDATA" != "no"; then |
||||||
|
+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) |
||||||
|
+ |
||||||
|
+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then |
||||||
|
+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", |
||||||
|
+ [Define for location of system timezone data]) |
||||||
|
+ fi |
||||||
|
+fi |
||||||
|
+ |
||||||
|
PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" |
||||||
|
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c |
||||||
|
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" |
||||||
|
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c |
||||||
|
index c7f93580d7..ec196a98b6 100644 |
||||||
|
--- a/ext/date/lib/parse_tz.c |
||||||
|
+++ b/ext/date/lib/parse_tz.c |
||||||
|
@@ -26,9 +26,33 @@ |
||||||
|
#include "timelib.h" |
||||||
|
#include "timelib_private.h" |
||||||
|
|
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+#include <sys/mman.h> |
||||||
|
+#include <sys/stat.h> |
||||||
|
+#include <limits.h> |
||||||
|
+#include <fcntl.h> |
||||||
|
+#include <unistd.h> |
||||||
|
+ |
||||||
|
+#include "php_scandir.h" |
||||||
|
+ |
||||||
|
+static const unsigned char internal_utc[] = { |
||||||
|
+ 0x54, 0x5a, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
||||||
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
||||||
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, |
||||||
|
+ 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x54, 0x5a, 0x69, 0x66, 0x32, 0x00, 0x00, 0x00, 0x00, 0x00, |
||||||
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
||||||
|
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, |
||||||
|
+ 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0x54, 0x43, 0x00, 0x0a, 0x55, 0x54, 0x43, |
||||||
|
+ 0x30, 0x0a |
||||||
|
+}; |
||||||
|
+ |
||||||
|
+#else |
||||||
|
#define TIMELIB_SUPPORTS_V2DATA |
||||||
|
#define TIMELIB_SUPPORT_SLIM_FILE |
||||||
|
#include "timezonedb.h" |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
+#include <ctype.h> |
||||||
|
|
||||||
|
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) |
||||||
|
# if defined(__LITTLE_ENDIAN__) |
||||||
|
@@ -95,6 +119,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz) |
||||||
|
{ |
||||||
|
uint32_t version; |
||||||
|
|
||||||
|
+ if (memcmp(*tzf, "TZif", 4) == 0) { |
||||||
|
+ *tzf += 20; |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
/* read ID */ |
||||||
|
version = (*tzf)[3] - '0'; |
||||||
|
*tzf += 4; |
||||||
|
@@ -577,7 +606,475 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz) |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
-static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb) |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA_PREFIX |
||||||
|
+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX |
||||||
|
+#else |
||||||
|
+#define ZONEINFO_PREFIX "/usr/share/zoneinfo" |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
+/* System timezone database pointer. */ |
||||||
|
+static const timelib_tzdb *timezonedb_system; |
||||||
|
+ |
||||||
|
+/* Hash table entry for the cache of the zone.tab mapping table. */ |
||||||
|
+struct location_info { |
||||||
|
+ char code[2]; |
||||||
|
+ double latitude, longitude; |
||||||
|
+ char name[64]; |
||||||
|
+ char *comment; |
||||||
|
+ struct location_info *next; |
||||||
|
+}; |
||||||
|
+ |
||||||
|
+/* Cache of zone.tab. */ |
||||||
|
+static struct location_info **system_location_table; |
||||||
|
+ |
||||||
|
+/* Size of the zone.tab hash table; a random-ish prime big enough to |
||||||
|
+ * prevent too many collisions. */ |
||||||
|
+#define LOCINFO_HASH_SIZE (1021) |
||||||
|
+ |
||||||
|
+/* Compute a case insensitive hash of str */ |
||||||
|
+static uint32_t tz_hash(const char *str) |
||||||
|
+{ |
||||||
|
+ const unsigned char *p = (const unsigned char *)str; |
||||||
|
+ uint32_t hash = 5381; |
||||||
|
+ int c; |
||||||
|
+ |
||||||
|
+ while ((c = tolower(*p++)) != '\0') { |
||||||
|
+ hash = (hash << 5) ^ hash ^ c; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ return hash % LOCINFO_HASH_SIZE; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Parse an ISO-6709 date as used in zone.tab. Returns end of the |
||||||
|
+ * parsed string on success, or NULL on parse error. On success, |
||||||
|
+ * writes the parsed number to *result. */ |
||||||
|
+static char *parse_iso6709(char *p, double *result) |
||||||
|
+{ |
||||||
|
+ double v, sign; |
||||||
|
+ char *pend; |
||||||
|
+ size_t len; |
||||||
|
+ |
||||||
|
+ if (*p == '+') |
||||||
|
+ sign = 1.0; |
||||||
|
+ else if (*p == '-') |
||||||
|
+ sign = -1.0; |
||||||
|
+ else |
||||||
|
+ return NULL; |
||||||
|
+ |
||||||
|
+ p++; |
||||||
|
+ for (pend = p; *pend >= '0' && *pend <= '9'; pend++) |
||||||
|
+ ;; |
||||||
|
+ |
||||||
|
+ /* Annoying encoding used by zone.tab has no decimal point, so use |
||||||
|
+ * the length to determine the format: |
||||||
|
+ * |
||||||
|
+ * 4 = DDMM |
||||||
|
+ * 5 = DDDMM |
||||||
|
+ * 6 = DDMMSS |
||||||
|
+ * 7 = DDDMMSS |
||||||
|
+ */ |
||||||
|
+ len = pend - p; |
||||||
|
+ if (len < 4 || len > 7) { |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ /* p => [D]DD */ |
||||||
|
+ v = (p[0] - '0') * 10.0 + (p[1] - '0'); |
||||||
|
+ p += 2; |
||||||
|
+ if (len == 5 || len == 7) |
||||||
|
+ v = v * 10.0 + (*p++ - '0'); |
||||||
|
+ /* p => MM[SS] */ |
||||||
|
+ v += (10.0 * (p[0] - '0') |
||||||
|
+ + p[1] - '0') / 60.0; |
||||||
|
+ p += 2; |
||||||
|
+ /* p => [SS] */ |
||||||
|
+ if (len > 5) { |
||||||
|
+ v += (10.0 * (p[0] - '0') |
||||||
|
+ + p[1] - '0') / 3600.0; |
||||||
|
+ p += 2; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ /* Round to five decimal place, not because it's a good idea, |
||||||
|
+ * but, because the builtin data uses rounded data, so, match |
||||||
|
+ * that. */ |
||||||
|
+ *result = trunc(v * sign * 100000.0) / 100000.0; |
||||||
|
+ |
||||||
|
+ return p; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* This function parses the zone.tab file to build up the mapping of |
||||||
|
+ * timezone to country code and geographic location, and returns a |
||||||
|
+ * hash table. The hash table is indexed by the function: |
||||||
|
+ * |
||||||
|
+ * tz_hash(timezone-name) |
||||||
|
+ */ |
||||||
|
+static struct location_info **create_location_table(void) |
||||||
|
+{ |
||||||
|
+ struct location_info **li, *i; |
||||||
|
+ char zone_tab[PATH_MAX]; |
||||||
|
+ char line[512]; |
||||||
|
+ FILE *fp; |
||||||
|
+ |
||||||
|
+ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab); |
||||||
|
+ |
||||||
|
+ fp = fopen(zone_tab, "r"); |
||||||
|
+ if (!fp) { |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ li = calloc(LOCINFO_HASH_SIZE, sizeof *li); |
||||||
|
+ |
||||||
|
+ while (fgets(line, sizeof line, fp)) { |
||||||
|
+ char *p = line, *code, *name, *comment; |
||||||
|
+ uint32_t hash; |
||||||
|
+ double latitude, longitude; |
||||||
|
+ |
||||||
|
+ while (isspace(*p)) |
||||||
|
+ p++; |
||||||
|
+ |
||||||
|
+ if (*p == '#' || *p == '\0' || *p == '\n') |
||||||
|
+ continue; |
||||||
|
+ |
||||||
|
+ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t') |
||||||
|
+ continue; |
||||||
|
+ |
||||||
|
+ /* code => AA */ |
||||||
|
+ code = p; |
||||||
|
+ p[2] = 0; |
||||||
|
+ p += 3; |
||||||
|
+ |
||||||
|
+ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */ |
||||||
|
+ p = parse_iso6709(p, &latitude); |
||||||
|
+ if (!p) { |
||||||
|
+ continue; |
||||||
|
+ } |
||||||
|
+ p = parse_iso6709(p, &longitude); |
||||||
|
+ if (!p) { |
||||||
|
+ continue; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ if (!p || *p != '\t') { |
||||||
|
+ continue; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ /* name = string */ |
||||||
|
+ name = ++p; |
||||||
|
+ while (*p != '\t' && *p && *p != '\n') |
||||||
|
+ p++; |
||||||
|
+ |
||||||
|
+ *p++ = '\0'; |
||||||
|
+ |
||||||
|
+ /* comment = string */ |
||||||
|
+ comment = p; |
||||||
|
+ while (*p != '\t' && *p && *p != '\n') |
||||||
|
+ p++; |
||||||
|
+ |
||||||
|
+ if (*p == '\n' || *p == '\t') |
||||||
|
+ *p = '\0'; |
||||||
|
+ |
||||||
|
+ hash = tz_hash(name); |
||||||
|
+ i = malloc(sizeof *i); |
||||||
|
+ memcpy(i->code, code, 2); |
||||||
|
+ strncpy(i->name, name, sizeof i->name); |
||||||
|
+ i->comment = strdup(comment); |
||||||
|
+ i->longitude = longitude; |
||||||
|
+ i->latitude = latitude; |
||||||
|
+ i->next = li[hash]; |
||||||
|
+ li[hash] = i; |
||||||
|
+ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */ |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ fclose(fp); |
||||||
|
+ |
||||||
|
+ return li; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Return location info from hash table, using given timezone name. |
||||||
|
+ * Returns NULL if the name could not be found. */ |
||||||
|
+const struct location_info *find_zone_info(struct location_info **li, |
||||||
|
+ const char *name) |
||||||
|
+{ |
||||||
|
+ uint32_t hash = tz_hash(name); |
||||||
|
+ const struct location_info *l; |
||||||
|
+ |
||||||
|
+ if (!li) { |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ for (l = li[hash]; l; l = l->next) { |
||||||
|
+ if (timelib_strcasecmp(l->name, name) == 0) |
||||||
|
+ return l; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ return NULL; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Filter out some non-tzdata files and the posix/right databases, if |
||||||
|
+ * present. */ |
||||||
|
+static int index_filter(const struct dirent *ent) |
||||||
|
+{ |
||||||
|
+ return strcmp(ent->d_name, ".") != 0 |
||||||
|
+ && strcmp(ent->d_name, "..") != 0 |
||||||
|
+ && strcmp(ent->d_name, "posix") != 0 |
||||||
|
+ && strcmp(ent->d_name, "posixrules") != 0 |
||||||
|
+ && strcmp(ent->d_name, "right") != 0 |
||||||
|
+ && strstr(ent->d_name, ".list") == NULL |
||||||
|
+ && strstr(ent->d_name, ".tab") == NULL; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+static int sysdbcmp(const void *first, const void *second) |
||||||
|
+{ |
||||||
|
+ const timelib_tzdb_index_entry *alpha = first, *beta = second; |
||||||
|
+ |
||||||
|
+ return timelib_strcasecmp(alpha->id, beta->id); |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Retrieve tzdata version. */ |
||||||
|
+static void retrieve_zone_version(timelib_tzdb *db) |
||||||
|
+{ |
||||||
|
+ static char buf[30]; |
||||||
|
+ char path[PATH_MAX]; |
||||||
|
+ FILE *fp; |
||||||
|
+ |
||||||
|
+ strncpy(path, ZONEINFO_PREFIX "/tzdata.zi", sizeof(path)); |
||||||
|
+ |
||||||
|
+ fp = fopen(path, "r"); |
||||||
|
+ if (fp) { |
||||||
|
+ if (fgets(buf, sizeof(buf), fp)) { |
||||||
|
+ if (!memcmp(buf, "# version ", 10) && |
||||||
|
+ isdigit(buf[10]) && |
||||||
|
+ isdigit(buf[11]) && |
||||||
|
+ isdigit(buf[12]) && |
||||||
|
+ isdigit(buf[13]) && |
||||||
|
+ islower(buf[14])) { |
||||||
|
+ if (buf[14] >= 't') { /* 2022t = 2022.20 */ |
||||||
|
+ buf[17] = 0; |
||||||
|
+ buf[16] = buf[14] - 't' + '0'; |
||||||
|
+ buf[15] = '2'; |
||||||
|
+ } else if (buf[14] >= 'j') { /* 2022j = 2022.10 */ |
||||||
|
+ buf[17] = 0; |
||||||
|
+ buf[16] = buf[14] - 'j' + '0'; |
||||||
|
+ buf[15] = '1'; |
||||||
|
+ } else { /* 2022a = 2022.1 */ |
||||||
|
+ buf[16] = 0; |
||||||
|
+ buf[15] = buf[14] - 'a' + '1'; |
||||||
|
+ } |
||||||
|
+ buf[14] = '.'; |
||||||
|
+ db->version = buf+10; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ fclose(fp); |
||||||
|
+ } |
||||||
|
+} |
||||||
|
+ |
||||||
|
+ |
||||||
|
+/* Create the zone identifier index by trawling the filesystem. */ |
||||||
|
+static void create_zone_index(timelib_tzdb *db) |
||||||
|
+{ |
||||||
|
+ size_t dirstack_size, dirstack_top; |
||||||
|
+ size_t index_size, index_next; |
||||||
|
+ timelib_tzdb_index_entry *db_index; |
||||||
|
+ char **dirstack; |
||||||
|
+ |
||||||
|
+ /* LIFO stack to hold directory entries to scan; each slot is a |
||||||
|
+ * directory name relative to the zoneinfo prefix. */ |
||||||
|
+ dirstack_size = 32; |
||||||
|
+ dirstack = malloc(dirstack_size * sizeof *dirstack); |
||||||
|
+ dirstack_top = 1; |
||||||
|
+ dirstack[0] = strdup(""); |
||||||
|
+ |
||||||
|
+ /* Index array. */ |
||||||
|
+ index_size = 64; |
||||||
|
+ db_index = malloc(index_size * sizeof *db_index); |
||||||
|
+ index_next = 0; |
||||||
|
+ |
||||||
|
+ do { |
||||||
|
+ struct dirent **ents; |
||||||
|
+ char name[PATH_MAX], *top; |
||||||
|
+ int count; |
||||||
|
+ |
||||||
|
+ /* Pop the top stack entry, and iterate through its contents. */ |
||||||
|
+ top = dirstack[--dirstack_top]; |
||||||
|
+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top); |
||||||
|
+ |
||||||
|
+ count = php_scandir(name, &ents, index_filter, php_alphasort); |
||||||
|
+ |
||||||
|
+ while (count > 0) { |
||||||
|
+ struct stat st; |
||||||
|
+ const char *leaf = ents[count - 1]->d_name; |
||||||
|
+ |
||||||
|
+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", |
||||||
|
+ top, leaf); |
||||||
|
+ |
||||||
|
+ if (strlen(name) && stat(name, &st) == 0) { |
||||||
|
+ /* Name, relative to the zoneinfo prefix. */ |
||||||
|
+ const char *root = top; |
||||||
|
+ |
||||||
|
+ if (root[0] == '/') root++; |
||||||
|
+ |
||||||
|
+ snprintf(name, sizeof name, "%s%s%s", root, |
||||||
|
+ *root ? "/": "", leaf); |
||||||
|
+ |
||||||
|
+ if (S_ISDIR(st.st_mode)) { |
||||||
|
+ if (dirstack_top == dirstack_size) { |
||||||
|
+ dirstack_size *= 2; |
||||||
|
+ dirstack = realloc(dirstack, |
||||||
|
+ dirstack_size * sizeof *dirstack); |
||||||
|
+ } |
||||||
|
+ dirstack[dirstack_top++] = strdup(name); |
||||||
|
+ } |
||||||
|
+ else { |
||||||
|
+ if (index_next == index_size) { |
||||||
|
+ index_size *= 2; |
||||||
|
+ db_index = realloc(db_index, |
||||||
|
+ index_size * sizeof *db_index); |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ db_index[index_next++].id = strdup(name); |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ free(ents[--count]); |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ if (count != -1) free(ents); |
||||||
|
+ free(top); |
||||||
|
+ } while (dirstack_top); |
||||||
|
+ |
||||||
|
+ qsort(db_index, index_next, sizeof *db_index, sysdbcmp); |
||||||
|
+ |
||||||
|
+ if (!index_next) { |
||||||
|
+ db_index[index_next++].id = strdup("UTC"); |
||||||
|
+ } |
||||||
|
+ db->index = db_index; |
||||||
|
+ db->index_size = index_next; |
||||||
|
+ |
||||||
|
+ free(dirstack); |
||||||
|
+} |
||||||
|
+ |
||||||
|
+#define FAKE_HEADER "1234\0??\1??" |
||||||
|
+#define FAKE_UTC_POS (7 - 4) |
||||||
|
+ |
||||||
|
+/* Create a fake data segment for database 'sysdb'. */ |
||||||
|
+static void fake_data_segment(timelib_tzdb *sysdb, |
||||||
|
+ struct location_info **info) |
||||||
|
+{ |
||||||
|
+ size_t n; |
||||||
|
+ char *data, *p; |
||||||
|
+ |
||||||
|
+ data = malloc(3 * sysdb->index_size + sizeof(FAKE_HEADER) - 1); |
||||||
|
+ |
||||||
|
+ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1); |
||||||
|
+ |
||||||
|
+ for (n = 0; n < sysdb->index_size; n++) { |
||||||
|
+ const struct location_info *li; |
||||||
|
+ timelib_tzdb_index_entry *ent; |
||||||
|
+ |
||||||
|
+ ent = (timelib_tzdb_index_entry *)&sysdb->index[n]; |
||||||
|
+ |
||||||
|
+ /* Lookup the timezone name in the hash table. */ |
||||||
|
+ if (strcmp(ent->id, "UTC") == 0) { |
||||||
|
+ ent->pos = FAKE_UTC_POS; |
||||||
|
+ continue; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ li = find_zone_info(info, ent->id); |
||||||
|
+ if (li) { |
||||||
|
+ /* If found, append the BC byte and the |
||||||
|
+ * country code; set the position for this |
||||||
|
+ * section of timezone data. */ |
||||||
|
+ ent->pos = (p - data) - 4; |
||||||
|
+ *p++ = '\1'; |
||||||
|
+ *p++ = li->code[0]; |
||||||
|
+ *p++ = li->code[1]; |
||||||
|
+ } |
||||||
|
+ else { |
||||||
|
+ /* If not found, the timezone data can |
||||||
|
+ * point at the header. */ |
||||||
|
+ ent->pos = 0; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ sysdb->data = (unsigned char *)data; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Returns true if the passed-in stat structure describes a |
||||||
|
+ * probably-valid timezone file. */ |
||||||
|
+static int is_valid_tzfile(const struct stat *st, int fd) |
||||||
|
+{ |
||||||
|
+ if (fd) { |
||||||
|
+ char buf[20]; |
||||||
|
+ if (read(fd, buf, 20)!=20) { |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ lseek(fd, SEEK_SET, 0); |
||||||
|
+ if (memcmp(buf, "TZif", 4)) { |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ return S_ISREG(st->st_mode) && st->st_size > 20; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* To allow timezone names to be used case-insensitively, find the |
||||||
|
+ * canonical name for this timezone, if possible. */ |
||||||
|
+static const char *canonical_tzname(const char *timezone) |
||||||
|
+{ |
||||||
|
+ if (timezonedb_system) { |
||||||
|
+ timelib_tzdb_index_entry *ent, lookup; |
||||||
|
+ |
||||||
|
+ lookup.id = (char *)timezone; |
||||||
|
+ |
||||||
|
+ ent = bsearch(&lookup, timezonedb_system->index, |
||||||
|
+ timezonedb_system->index_size, sizeof lookup, |
||||||
|
+ sysdbcmp); |
||||||
|
+ if (ent) { |
||||||
|
+ return ent->id; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ return timezone; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+/* Return the mmap()ed tzfile if found, else NULL. On success, the |
||||||
|
+ * length of the mapped data is placed in *length. */ |
||||||
|
+static char *map_tzfile(const char *timezone, size_t *length) |
||||||
|
+{ |
||||||
|
+ char fname[PATH_MAX]; |
||||||
|
+ struct stat st; |
||||||
|
+ char *p; |
||||||
|
+ int fd; |
||||||
|
+ |
||||||
|
+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) { |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone)); |
||||||
|
+ |
||||||
|
+ fd = open(fname, O_RDONLY); |
||||||
|
+ if (fd == -1) { |
||||||
|
+ if (strcmp(timezone, "UTC")) { |
||||||
|
+ return NULL; |
||||||
|
+ } else { |
||||||
|
+ *length = sizeof(internal_utc); |
||||||
|
+ return internal_utc; |
||||||
|
+ } |
||||||
|
+ } else if (fstat(fd, &st) != 0 || !is_valid_tzfile(&st, fd)) { |
||||||
|
+ close(fd); |
||||||
|
+ return NULL; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ *length = st.st_size; |
||||||
|
+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); |
||||||
|
+ close(fd); |
||||||
|
+ |
||||||
|
+ return p != MAP_FAILED ? p : NULL; |
||||||
|
+} |
||||||
|
+ |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
+static int inmem_seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb) |
||||||
|
{ |
||||||
|
int left = 0, right = tzdb->index_size - 1; |
||||||
|
|
||||||
|
@@ -603,9 +1100,49 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, |
||||||
|
return 0; |
||||||
|
} |
||||||
|
|
||||||
|
+static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, |
||||||
|
+ char **map, size_t *maplen, |
||||||
|
+ const timelib_tzdb *tzdb) |
||||||
|
+{ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ if (tzdb == timezonedb_system) { |
||||||
|
+ char *orig; |
||||||
|
+ |
||||||
|
+ orig = map_tzfile(timezone, maplen); |
||||||
|
+ if (orig == NULL) { |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ (*tzf) = (unsigned char *)orig; |
||||||
|
+ *map = orig; |
||||||
|
+ return 1; |
||||||
|
+ } |
||||||
|
+ else |
||||||
|
+#endif |
||||||
|
+ { |
||||||
|
+ return inmem_seek_to_tz_position(tzf, timezone, tzdb); |
||||||
|
+ } |
||||||
|
+} |
||||||
|
+ |
||||||
|
const timelib_tzdb *timelib_builtin_db(void) |
||||||
|
{ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ if (timezonedb_system == NULL) { |
||||||
|
+ timelib_tzdb *tmp = malloc(sizeof *tmp); |
||||||
|
+ |
||||||
|
+ tmp->version = "0"; |
||||||
|
+ tmp->data = NULL; |
||||||
|
+ create_zone_index(tmp); |
||||||
|
+ retrieve_zone_version(tmp); |
||||||
|
+ system_location_table = create_location_table(); |
||||||
|
+ fake_data_segment(tmp, system_location_table); |
||||||
|
+ timezonedb_system = tmp; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ return timezonedb_system; |
||||||
|
+#else |
||||||
|
return &timezonedb_builtin; |
||||||
|
+#endif |
||||||
|
} |
||||||
|
|
||||||
|
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) |
||||||
|
@@ -617,7 +1154,32 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_ |
||||||
|
int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb) |
||||||
|
{ |
||||||
|
const unsigned char *tzf; |
||||||
|
- return (seek_to_tz_position(&tzf, timezone, tzdb)); |
||||||
|
+ |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ if (tzdb == timezonedb_system) { |
||||||
|
+ char fname[PATH_MAX]; |
||||||
|
+ struct stat st; |
||||||
|
+ |
||||||
|
+ if (timezone[0] == '\0' || strstr(timezone, "..") != NULL) { |
||||||
|
+ return 0; |
||||||
|
+ } |
||||||
|
+ if (!strcmp(timezone, "UTC")) { |
||||||
|
+ return 1; |
||||||
|
+ } |
||||||
|
+ if (system_location_table) { |
||||||
|
+ if (find_zone_info(system_location_table, timezone) != NULL) { |
||||||
|
+ /* found in cache */ |
||||||
|
+ return 1; |
||||||
|
+ } |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", canonical_tzname(timezone)); |
||||||
|
+ |
||||||
|
+ return stat(fname, &st) == 0 && is_valid_tzfile(&st, 0); |
||||||
|
+ } |
||||||
|
+#endif |
||||||
|
+ |
||||||
|
+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); |
||||||
|
} |
||||||
|
|
||||||
|
static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) |
||||||
|
@@ -662,6 +1224,8 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name) |
||||||
|
timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code) |
||||||
|
{ |
||||||
|
const unsigned char *tzf; |
||||||
|
+ char *memmap = NULL; |
||||||
|
+ size_t maplen; |
||||||
|
timelib_tzinfo *tmp; |
||||||
|
int version; |
||||||
|
int transitions_result, types_result; |
||||||
|
@@ -669,7 +1233,7 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t |
||||||
|
|
||||||
|
*error_code = TIMELIB_ERROR_NO_ERROR; |
||||||
|
|
||||||
|
- if (seek_to_tz_position(&tzf, timezone, tzdb)) { |
||||||
|
+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { |
||||||
|
tmp = timelib_tzinfo_ctor(timezone); |
||||||
|
|
||||||
|
version = read_preamble(&tzf, tmp, &type); |
||||||
|
@@ -712,11 +1276,38 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t |
||||||
|
return NULL; |
||||||
|
} |
||||||
|
|
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ if (memmap) { |
||||||
|
+ const struct location_info *li; |
||||||
|
+ |
||||||
|
+ /* TZif-style - grok the location info from the system database, |
||||||
|
+ * if possible. */ |
||||||
|
+ |
||||||
|
+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { |
||||||
|
+ tmp->location.comments = timelib_strdup(li->comment); |
||||||
|
+ strncpy(tmp->location.country_code, li->code, 2); |
||||||
|
+ tmp->location.longitude = li->longitude; |
||||||
|
+ tmp->location.latitude = li->latitude; |
||||||
|
+ tmp->bc = 1; |
||||||
|
+ } |
||||||
|
+ else { |
||||||
|
+ set_default_location_and_comments(&tzf, tmp); |
||||||
|
+ } |
||||||
|
+ |
||||||
|
+ /* Now done with the mmap segment - discard it. */ |
||||||
|
+ if (memmap != internal_utc) { |
||||||
|
+ munmap(memmap, maplen); |
||||||
|
+ } |
||||||
|
+ } else { |
||||||
|
+#endif |
||||||
|
if (type == TIMELIB_TZINFO_PHP) { |
||||||
|
read_location(&tzf, tmp); |
||||||
|
} else { |
||||||
|
set_default_location_and_comments(&tzf, tmp); |
||||||
|
} |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ } |
||||||
|
+#endif |
||||||
|
} else { |
||||||
|
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; |
||||||
|
tmp = NULL; |
||||||
|
diff --git a/ext/date/php_date.c b/ext/date/php_date.c |
||||||
|
index 48c82bf7ec..443299c089 100644 |
||||||
|
--- a/ext/date/php_date.c |
||||||
|
+++ b/ext/date/php_date.c |
||||||
|
@@ -490,7 +490,11 @@ PHP_MINFO_FUNCTION(date) |
||||||
|
php_info_print_table_row(2, "date/time support", "enabled"); |
||||||
|
php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION); |
||||||
|
php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version); |
||||||
|
+#ifdef HAVE_SYSTEM_TZDATA |
||||||
|
+ php_info_print_table_row(2, "Timezone Database", "system"); |
||||||
|
+#else |
||||||
|
php_info_print_table_row(2, "Timezone Database", php_date_global_timezone_db_enabled ? "external" : "internal"); |
||||||
|
+#endif |
||||||
|
php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb)); |
||||||
|
php_info_print_table_end(); |
||||||
|
|
@ -0,0 +1,16 @@ |
|||||||
|
diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php |
||||||
|
--- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200 |
||||||
|
+++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200 |
||||||
|
@@ -3265,6 +3265,12 @@ function initPhpParser() { |
||||||
|
} |
||||||
|
|
||||||
|
$isInitialized = true; |
||||||
|
+ |
||||||
|
+ if (file_exists('/usr/share/php/PhpParser4/autoload.php')) { |
||||||
|
+ require_once '/usr/share/php/PhpParser4/autoload.php'; |
||||||
|
+ return; |
||||||
|
+ } |
||||||
|
+ |
||||||
|
$version = "4.15.1"; |
||||||
|
$phpParserDir = __DIR__ . "/PHP-Parser-$version"; |
||||||
|
if (!is_dir($phpParserDir)) { |
@ -0,0 +1,438 @@ |
|||||||
|
; Start a new pool named 'www'. |
||||||
|
; the variable $pool can be used in any directive and will be replaced by the |
||||||
|
; pool name ('www' here) |
||||||
|
[www] |
||||||
|
|
||||||
|
; Per pool prefix |
||||||
|
; It only applies on the following directives: |
||||||
|
; - 'access.log' |
||||||
|
; - 'slowlog' |
||||||
|
; - 'listen' (unixsocket) |
||||||
|
; - 'chroot' |
||||||
|
; - 'chdir' |
||||||
|
; - 'php_values' |
||||||
|
; - 'php_admin_values' |
||||||
|
; When not set, the global prefix (or @php_fpm_prefix@) applies instead. |
||||||
|
; Note: This directive can also be relative to the global prefix. |
||||||
|
; Default Value: none |
||||||
|
;prefix = /path/to/pools/$pool |
||||||
|
|
||||||
|
; Unix user/group of processes |
||||||
|
; Note: The user is mandatory. If the group is not set, the default user's group |
||||||
|
; will be used. |
||||||
|
; RPM: apache user chosen to provide access to the same directories as httpd |
||||||
|
user = apache |
||||||
|
; RPM: Keep a group allowed to write in log dir. |
||||||
|
group = apache |
||||||
|
|
||||||
|
; The address on which to accept FastCGI requests. |
||||||
|
; Valid syntaxes are: |
||||||
|
; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on |
||||||
|
; a specific port; |
||||||
|
; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on |
||||||
|
; a specific port; |
||||||
|
; 'port' - to listen on a TCP socket to all addresses |
||||||
|
; (IPv6 and IPv4-mapped) on a specific port; |
||||||
|
; '/path/to/unix/socket' - to listen on a unix socket. |
||||||
|
; Note: This value is mandatory. |
||||||
|
listen = /run/php-fpm/www.sock |
||||||
|
|
||||||
|
; Set listen(2) backlog. |
||||||
|
; Default Value: 511 |
||||||
|
;listen.backlog = 511 |
||||||
|
|
||||||
|
; Set permissions for unix socket, if one is used. In Linux, read/write |
||||||
|
; permissions must be set in order to allow connections from a web server. |
||||||
|
; Default Values: user and group are set as the running user |
||||||
|
; mode is set to 0660 |
||||||
|
;listen.owner = nobody |
||||||
|
;listen.group = nobody |
||||||
|
;listen.mode = 0660 |
||||||
|
|
||||||
|
; When POSIX Access Control Lists are supported you can set them using |
||||||
|
; these options, value is a comma separated list of user/group names. |
||||||
|
; When set, listen.owner and listen.group are ignored |
||||||
|
listen.acl_users = apache,nginx |
||||||
|
;listen.acl_groups = |
||||||
|
|
||||||
|
; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. |
||||||
|
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original |
||||||
|
; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address |
||||||
|
; must be separated by a comma. If this value is left blank, connections will be |
||||||
|
; accepted from any ip address. |
||||||
|
; Default Value: any |
||||||
|
listen.allowed_clients = 127.0.0.1 |
||||||
|
|
||||||
|
; Specify the nice(2) priority to apply to the pool processes (only if set) |
||||||
|
; The value can vary from -19 (highest priority) to 20 (lower priority) |
||||||
|
; Note: - It will only work if the FPM master process is launched as root |
||||||
|
; - The pool processes will inherit the master process priority |
||||||
|
; unless it specified otherwise |
||||||
|
; Default Value: no set |
||||||
|
; process.priority = -19 |
||||||
|
|
||||||
|
; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user |
||||||
|
; or group is differrent than the master process user. It allows to create process |
||||||
|
; core dump and ptrace the process for the pool user. |
||||||
|
; Default Value: no |
||||||
|
; process.dumpable = yes |
||||||
|
|
||||||
|
; Choose how the process manager will control the number of child processes. |
||||||
|
; Possible Values: |
||||||
|
; static - a fixed number (pm.max_children) of child processes; |
||||||
|
; dynamic - the number of child processes are set dynamically based on the |
||||||
|
; following directives. With this process management, there will be |
||||||
|
; always at least 1 children. |
||||||
|
; pm.max_children - the maximum number of children that can |
||||||
|
; be alive at the same time. |
||||||
|
; pm.start_servers - the number of children created on startup. |
||||||
|
; pm.min_spare_servers - the minimum number of children in 'idle' |
||||||
|
; state (waiting to process). If the number |
||||||
|
; of 'idle' processes is less than this |
||||||
|
; number then some children will be created. |
||||||
|
; pm.max_spare_servers - the maximum number of children in 'idle' |
||||||
|
; state (waiting to process). If the number |
||||||
|
; of 'idle' processes is greater than this |
||||||
|
; number then some children will be killed. |
||||||
|
; ondemand - no children are created at startup. Children will be forked when |
||||||
|
; new requests will connect. The following parameter are used: |
||||||
|
; pm.max_children - the maximum number of children that |
||||||
|
; can be alive at the same time. |
||||||
|
; pm.process_idle_timeout - The number of seconds after which |
||||||
|
; an idle process will be killed. |
||||||
|
; Note: This value is mandatory. |
||||||
|
pm = dynamic |
||||||
|
|
||||||
|
; The number of child processes to be created when pm is set to 'static' and the |
||||||
|
; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. |
||||||
|
; This value sets the limit on the number of simultaneous requests that will be |
||||||
|
; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. |
||||||
|
; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP |
||||||
|
; CGI. The below defaults are based on a server without much resources. Don't |
||||||
|
; forget to tweak pm.* to fit your needs. |
||||||
|
; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' |
||||||
|
; Note: This value is mandatory. |
||||||
|
pm.max_children = 50 |
||||||
|
|
||||||
|
; The number of child processes created on startup. |
||||||
|
; Note: Used only when pm is set to 'dynamic' |
||||||
|
; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 |
||||||
|
pm.start_servers = 5 |
||||||
|
|
||||||
|
; The desired minimum number of idle server processes. |
||||||
|
; Note: Used only when pm is set to 'dynamic' |
||||||
|
; Note: Mandatory when pm is set to 'dynamic' |
||||||
|
pm.min_spare_servers = 5 |
||||||
|
|
||||||
|
; The desired maximum number of idle server processes. |
||||||
|
; Note: Used only when pm is set to 'dynamic' |
||||||
|
; Note: Mandatory when pm is set to 'dynamic' |
||||||
|
pm.max_spare_servers = 35 |
||||||
|
|
||||||
|
; The number of seconds after which an idle process will be killed. |
||||||
|
; Note: Used only when pm is set to 'ondemand' |
||||||
|
; Default Value: 10s |
||||||
|
;pm.process_idle_timeout = 10s; |
||||||
|
|
||||||
|
; The number of requests each child process should execute before respawning. |
||||||
|
; This can be useful to work around memory leaks in 3rd party libraries. For |
||||||
|
; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. |
||||||
|
; Default Value: 0 |
||||||
|
;pm.max_requests = 500 |
||||||
|
|
||||||
|
; The URI to view the FPM status page. If this value is not set, no URI will be |
||||||
|
; recognized as a status page. It shows the following informations: |
||||||
|
; pool - the name of the pool; |
||||||
|
; process manager - static, dynamic or ondemand; |
||||||
|
; start time - the date and time FPM has started; |
||||||
|
; start since - number of seconds since FPM has started; |
||||||
|
; accepted conn - the number of request accepted by the pool; |
||||||
|
; listen queue - the number of request in the queue of pending |
||||||
|
; connections (see backlog in listen(2)); |
||||||
|
; max listen queue - the maximum number of requests in the queue |
||||||
|
; of pending connections since FPM has started; |
||||||
|
; listen queue len - the size of the socket queue of pending connections; |
||||||
|
; idle processes - the number of idle processes; |
||||||
|
; active processes - the number of active processes; |
||||||
|
; total processes - the number of idle + active processes; |
||||||
|
; max active processes - the maximum number of active processes since FPM |
||||||
|
; has started; |
||||||
|
; max children reached - number of times, the process limit has been reached, |
||||||
|
; when pm tries to start more children (works only for |
||||||
|
; pm 'dynamic' and 'ondemand'); |
||||||
|
; Value are updated in real time. |
||||||
|
; Example output: |
||||||
|
; pool: www |
||||||
|
; process manager: static |
||||||
|
; start time: 01/Jul/2011:17:53:49 +0200 |
||||||
|
; start since: 62636 |
||||||
|
; accepted conn: 190460 |
||||||
|
; listen queue: 0 |
||||||
|
; max listen queue: 1 |
||||||
|
; listen queue len: 42 |
||||||
|
; idle processes: 4 |
||||||
|
; active processes: 11 |
||||||
|
; total processes: 15 |
||||||
|
; max active processes: 12 |
||||||
|
; max children reached: 0 |
||||||
|
; |
||||||
|
; By default the status page output is formatted as text/plain. Passing either |
||||||
|
; 'html', 'xml' or 'json' in the query string will return the corresponding |
||||||
|
; output syntax. Example: |
||||||
|
; http://www.foo.bar/status |
||||||
|
; http://www.foo.bar/status?json |
||||||
|
; http://www.foo.bar/status?html |
||||||
|
; http://www.foo.bar/status?xml |
||||||
|
; |
||||||
|
; By default the status page only outputs short status. Passing 'full' in the |
||||||
|
; query string will also return status for each pool process. |
||||||
|
; Example: |
||||||
|
; http://www.foo.bar/status?full |
||||||
|
; http://www.foo.bar/status?json&full |
||||||
|
; http://www.foo.bar/status?html&full |
||||||
|
; http://www.foo.bar/status?xml&full |
||||||
|
; The Full status returns for each process: |
||||||
|
; pid - the PID of the process; |
||||||
|
; state - the state of the process (Idle, Running, ...); |
||||||
|
; start time - the date and time the process has started; |
||||||
|
; start since - the number of seconds since the process has started; |
||||||
|
; requests - the number of requests the process has served; |
||||||
|
; request duration - the duration in µs of the requests; |
||||||
|
; request method - the request method (GET, POST, ...); |
||||||
|
; request URI - the request URI with the query string; |
||||||
|
; content length - the content length of the request (only with POST); |
||||||
|
; user - the user (PHP_AUTH_USER) (or '-' if not set); |
||||||
|
; script - the main script called (or '-' if not set); |
||||||
|
; last request cpu - the %cpu the last request consumed |
||||||
|
; it's always 0 if the process is not in Idle state |
||||||
|
; because CPU calculation is done when the request |
||||||
|
; processing has terminated; |
||||||
|
; last request memory - the max amount of memory the last request consumed |
||||||
|
; it's always 0 if the process is not in Idle state |
||||||
|
; because memory calculation is done when the request |
||||||
|
; processing has terminated; |
||||||
|
; If the process is in Idle state, then informations are related to the |
||||||
|
; last request the process has served. Otherwise informations are related to |
||||||
|
; the current request being served. |
||||||
|
; Example output: |
||||||
|
; ************************ |
||||||
|
; pid: 31330 |
||||||
|
; state: Running |
||||||
|
; start time: 01/Jul/2011:17:53:49 +0200 |
||||||
|
; start since: 63087 |
||||||
|
; requests: 12808 |
||||||
|
; request duration: 1250261 |
||||||
|
; request method: GET |
||||||
|
; request URI: /test_mem.php?N=10000 |
||||||
|
; content length: 0 |
||||||
|
; user: - |
||||||
|
; script: /home/fat/web/docs/php/test_mem.php |
||||||
|
; last request cpu: 0.00 |
||||||
|
; last request memory: 0 |
||||||
|
; |
||||||
|
; Note: There is a real-time FPM status monitoring sample web page available |
||||||
|
; It's available in: @EXPANDED_DATADIR@/fpm/status.html |
||||||
|
; |
||||||
|
; Note: The value must start with a leading slash (/). The value can be |
||||||
|
; anything, but it may not be a good idea to use the .php extension or it |
||||||
|
; may conflict with a real PHP file. |
||||||
|
; Default Value: not set |
||||||
|
;pm.status_path = /status |
||||||
|
|
||||||
|
; The ping URI to call the monitoring page of FPM. If this value is not set, no |
||||||
|
; URI will be recognized as a ping page. This could be used to test from outside |
||||||
|
; that FPM is alive and responding, or to |
||||||
|
; - create a graph of FPM availability (rrd or such); |
||||||
|
; - remove a server from a group if it is not responding (load balancing); |
||||||
|
; - trigger alerts for the operating team (24/7). |
||||||
|
; Note: The value must start with a leading slash (/). The value can be |
||||||
|
; anything, but it may not be a good idea to use the .php extension or it |
||||||
|
; may conflict with a real PHP file. |
||||||
|
; Default Value: not set |
||||||
|
;ping.path = /ping |
||||||
|
|
||||||
|
; This directive may be used to customize the response of a ping request. The |
||||||
|
; response is formatted as text/plain with a 200 response code. |
||||||
|
; Default Value: pong |
||||||
|
;ping.response = pong |
||||||
|
|
||||||
|
; The access log file |
||||||
|
; Default: not set |
||||||
|
;access.log = log/$pool.access.log |
||||||
|
|
||||||
|
; The access log format. |
||||||
|
; The following syntax is allowed |
||||||
|
; %%: the '%' character |
||||||
|
; %C: %CPU used by the request |
||||||
|
; it can accept the following format: |
||||||
|
; - %{user}C for user CPU only |
||||||
|
; - %{system}C for system CPU only |
||||||
|
; - %{total}C for user + system CPU (default) |
||||||
|
; %d: time taken to serve the request |
||||||
|
; it can accept the following format: |
||||||
|
; - %{seconds}d (default) |
||||||
|
; - %{miliseconds}d |
||||||
|
; - %{mili}d |
||||||
|
; - %{microseconds}d |
||||||
|
; - %{micro}d |
||||||
|
; %e: an environment variable (same as $_ENV or $_SERVER) |
||||||
|
; it must be associated with embraces to specify the name of the env |
||||||
|
; variable. Some exemples: |
||||||
|
; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e |
||||||
|
; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e |
||||||
|
; %f: script filename |
||||||
|
; %l: content-length of the request (for POST request only) |
||||||
|
; %m: request method |
||||||
|
; %M: peak of memory allocated by PHP |
||||||
|
; it can accept the following format: |
||||||
|
; - %{bytes}M (default) |
||||||
|
; - %{kilobytes}M |
||||||
|
; - %{kilo}M |
||||||
|
; - %{megabytes}M |
||||||
|
; - %{mega}M |
||||||
|
; %n: pool name |
||||||
|
; %o: output header |
||||||
|
; it must be associated with embraces to specify the name of the header: |
||||||
|
; - %{Content-Type}o |
||||||
|
; - %{X-Powered-By}o |
||||||
|
; - %{Transfert-Encoding}o |
||||||
|
; - .... |
||||||
|
; %p: PID of the child that serviced the request |
||||||
|
; %P: PID of the parent of the child that serviced the request |
||||||
|
; %q: the query string |
||||||
|
; %Q: the '?' character if query string exists |
||||||
|
; %r: the request URI (without the query string, see %q and %Q) |
||||||
|
; %R: remote IP address |
||||||
|
; %s: status (response code) |
||||||
|
; %t: server time the request was received |
||||||
|
; it can accept a strftime(3) format: |
||||||
|
; %d/%b/%Y:%H:%M:%S %z (default) |
||||||
|
; The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag |
||||||
|
; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t |
||||||
|
; %T: time the log has been written (the request has finished) |
||||||
|
; it can accept a strftime(3) format: |
||||||
|
; %d/%b/%Y:%H:%M:%S %z (default) |
||||||
|
; The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag |
||||||
|
; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t |
||||||
|
; %u: remote user |
||||||
|
; |
||||||
|
; Default: "%R - %u %t \"%m %r\" %s" |
||||||
|
;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" |
||||||
|
|
||||||
|
; 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 |
||||||
|
|
||||||
|
; The timeout for serving a single request after which a PHP backtrace will be |
||||||
|
; dumped to the 'slowlog' file. A value of '0s' means 'off'. |
||||||
|
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) |
||||||
|
; Default Value: 0 |
||||||
|
;request_slowlog_timeout = 0 |
||||||
|
|
||||||
|
; Depth of slow log stack trace. |
||||||
|
; Default Value: 20 |
||||||
|
;request_slowlog_trace_depth = 20 |
||||||
|
|
||||||
|
; The timeout for serving a single request after which the worker process will |
||||||
|
; be killed. This option should be used when the 'max_execution_time' ini option |
||||||
|
; does not stop script execution for some reason. A value of '0' means 'off'. |
||||||
|
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) |
||||||
|
; Default Value: 0 |
||||||
|
;request_terminate_timeout = 0 |
||||||
|
|
||||||
|
; Set open file descriptor rlimit. |
||||||
|
; Default Value: system defined value |
||||||
|
;rlimit_files = 1024 |
||||||
|
|
||||||
|
; Set max core size rlimit. |
||||||
|
; Possible Values: 'unlimited' or an integer greater or equal to 0 |
||||||
|
; Default Value: system defined value |
||||||
|
;rlimit_core = 0 |
||||||
|
|
||||||
|
; Chroot to this directory at the start. This value must be defined as an |
||||||
|
; absolute path. When this value is not set, chroot is not used. |
||||||
|
; Note: you can prefix with '$prefix' to chroot to the pool prefix or one |
||||||
|
; of its subdirectories. If the pool prefix is not set, the global prefix |
||||||
|
; will be used instead. |
||||||
|
; Note: chrooting is a great security feature and should be used whenever |
||||||
|
; possible. However, all PHP paths will be relative to the chroot |
||||||
|
; (error_log, sessions.save_path, ...). |
||||||
|
; Default Value: not set |
||||||
|
;chroot = |
||||||
|
|
||||||
|
; Chdir to this directory at the start. |
||||||
|
; Note: relative path can be used. |
||||||
|
; Default Value: current directory or / when chroot |
||||||
|
;chdir = /var/www |
||||||
|
|
||||||
|
; Redirect worker stdout and stderr into main error log. If not set, stdout and |
||||||
|
; stderr will be redirected to /dev/null according to FastCGI specs. |
||||||
|
; Note: on highloaded environement, this can cause some delay in the page |
||||||
|
; process time (several ms). |
||||||
|
; Default Value: no |
||||||
|
;catch_workers_output = yes |
||||||
|
|
||||||
|
; Clear environment in FPM workers |
||||||
|
; Prevents arbitrary environment variables from reaching FPM worker processes |
||||||
|
; by clearing the environment in workers before env vars specified in this |
||||||
|
; pool configuration are added. |
||||||
|
; Setting to "no" will make all environment variables available to PHP code |
||||||
|
; via getenv(), $_ENV and $_SERVER. |
||||||
|
; Default Value: yes |
||||||
|
;clear_env = no |
||||||
|
|
||||||
|
; Limits the extensions of the main script FPM will allow to parse. This can |
||||||
|
; prevent configuration mistakes on the web server side. You should only limit |
||||||
|
; FPM to .php extensions to prevent malicious users to use other extensions to |
||||||
|
; execute php code. |
||||||
|
; Note: set an empty value to allow all extensions. |
||||||
|
; Default Value: .php |
||||||
|
;security.limit_extensions = .php .php3 .php4 .php5 .php7 |
||||||
|
|
||||||
|
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from |
||||||
|
; the current environment. |
||||||
|
; Default Value: clean env |
||||||
|
;env[HOSTNAME] = $HOSTNAME |
||||||
|
;env[PATH] = /usr/local/bin:/usr/bin:/bin |
||||||
|
;env[TMP] = /tmp |
||||||
|
;env[TMPDIR] = /tmp |
||||||
|
;env[TEMP] = /tmp |
||||||
|
|
||||||
|
; Additional php.ini defines, specific to this pool of workers. These settings |
||||||
|
; overwrite the values previously defined in the php.ini. The directives are the |
||||||
|
; same as the PHP SAPI: |
||||||
|
; php_value/php_flag - you can set classic ini defines which can |
||||||
|
; be overwritten from PHP call 'ini_set'. |
||||||
|
; php_admin_value/php_admin_flag - these directives won't be overwritten by |
||||||
|
; PHP call 'ini_set' |
||||||
|
; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. |
||||||
|
|
||||||
|
; Defining 'extension' will load the corresponding shared extension from |
||||||
|
; extension_dir. Defining 'disable_functions' or 'disable_classes' will not |
||||||
|
; overwrite previously defined php.ini values, but will append the new value |
||||||
|
; instead. |
||||||
|
|
||||||
|
; Note: path INI options can be relative and will be expanded with the prefix |
||||||
|
; (pool, global or @prefix@) |
||||||
|
|
||||||
|
; Default Value: nothing is defined by default except the values in php.ini and |
||||||
|
; specified at startup with the -d argument |
||||||
|
;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com |
||||||
|
;php_flag[display_errors] = off |
||||||
|
php_admin_value[error_log] = /var/log/php-fpm/www-error.log |
||||||
|
php_admin_flag[log_errors] = on |
||||||
|
;php_admin_value[memory_limit] = 128M |
||||||
|
|
||||||
|
; Set the following data paths to directories owned by the FPM process user. |
||||||
|
; |
||||||
|
; Do not change the ownership of existing system directories, if the process |
||||||
|
; user does not have write permission, create dedicated directories for this |
||||||
|
; purpose. |
||||||
|
; |
||||||
|
; See warning about choosing the location of these directories on your system |
||||||
|
; at http://php.net/session.save-path |
||||||
|
php_value[session.save_handler] = files |
||||||
|
php_value[session.save_path] = /var/lib/php/session |
||||||
|
php_value[soap.wsdl_cache_dir] = /var/lib/php/wsdlcache |
||||||
|
;php_value[opcache.file_cache] = /var/lib/php/opcache |
@ -0,0 +1,62 @@ |
|||||||
|
# |
||||||
|
# The following lines prevent .user.ini files from being viewed by Web clients. |
||||||
|
# |
||||||
|
<Files ".user.ini"> |
||||||
|
Require all denied |
||||||
|
</Files> |
||||||
|
|
||||||
|
# |
||||||
|
# Allow php to handle Multiviews |
||||||
|
# |
||||||
|
AddType text/html .php |
||||||
|
|
||||||
|
# |
||||||
|
# Add index.php to the list of files that will be served as directory |
||||||
|
# indexes. |
||||||
|
# |
||||||
|
DirectoryIndex index.php |
||||||
|
|
||||||
|
# |
||||||
|
# Redirect to local php-fpm (no mod_php in default configuration) |
||||||
|
# |
||||||
|
<IfModule !mod_php.c> |
||||||
|
# Enable http authorization headers |
||||||
|
SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 |
||||||
|
|
||||||
|
<FilesMatch \.(php|phar)$> |
||||||
|
SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost" |
||||||
|
</FilesMatch> |
||||||
|
</IfModule> |
||||||
|
|
||||||
|
# |
||||||
|
# mod_php is deprecated as FPM is now used by default with httpd in event mode |
||||||
|
# mod_php is only used when explicitly enabled or httpd switch to prefork mode |
||||||
|
# |
||||||
|
# mod_php options |
||||||
|
# |
||||||
|
<IfModule mod_php.c> |
||||||
|
# |
||||||
|
# Cause the PHP interpreter to handle files with a .php extension. |
||||||
|
# |
||||||
|
<FilesMatch \.(php|phar)$> |
||||||
|
SetHandler application/x-httpd-php |
||||||
|
</FilesMatch> |
||||||
|
|
||||||
|
# |
||||||
|
# Uncomment the following lines to allow PHP to pretty-print .phps |
||||||
|
# files as PHP source code: |
||||||
|
# |
||||||
|
#<FilesMatch \.phps$> |
||||||
|
# SetHandler application/x-httpd-php-source |
||||||
|
#</FilesMatch> |
||||||
|
|
||||||
|
# |
||||||
|
# Apache specific PHP configuration options |
||||||
|
# those can be override in each configured vhost |
||||||
|
# |
||||||
|
php_value session.save_handler "files" |
||||||
|
php_value session.save_path "/var/lib/php/session" |
||||||
|
php_value soap.wsdl_cache_dir "/var/lib/php/wsdlcache" |
||||||
|
|
||||||
|
#php_value opcache.file_cache "/var/lib/php/opcache" |
||||||
|
</IfModule> |
Loading…
Reference in new issue