Import rpm: 16c88f40aeacd61dd6d70b0c3aefc8fc48fdc092
This commit is contained in:
		
						commit
						e4ee820fb9
					
				
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,2 @@ | ||||
| SOURCES/php-8.0.20.tar.xz | ||||
| SOURCES/php-keyring.gpg | ||||
							
								
								
									
										153
									
								
								10-opcache.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										153
									
								
								10-opcache.ini
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,153 @@ | ||||
| ; 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. | ||||
| ; This should improve performance, but 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. | ||||
| ; http://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. | ||||
| ; http://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 | ||||
							
								
								
									
										13
									
								
								20-ffi.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								20-ffi.ini
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,13 @@ | ||||
| ; Enable ffi extension module | ||||
| extension=ffi | ||||
| 
 | ||||
| ; FFI API restriction. Possibe values: | ||||
| ; "preload" - enabled in CLI scripts and preloaded files (default) | ||||
| ; "false"   - always disabled | ||||
| ; "true"    - always enabled | ||||
| ;ffi.enable=preload | ||||
| 
 | ||||
| ; List of headers files to preload, wildcard patterns allowed. | ||||
| ; /usr/share/php/preload used by for RPM packages | ||||
| ; /usr/local/share/php/preload may be used for local files | ||||
| ffi.preload=/usr/share/php/preload/*.h:/usr/local/share/php/preload/*.h | ||||
							
								
								
									
										22
									
								
								Makefile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								Makefile
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,22 @@ | ||||
| # Makefile for source rpm: php
 | ||||
| # $Id$
 | ||||
| NAME := php | ||||
| SPECFILE = $(firstword $(wildcard *.spec)) | ||||
| UPSTREAM_CHECKS :=  | ||||
| 
 | ||||
| define find-makefile-common | ||||
| for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done | ||||
| endef | ||||
| 
 | ||||
| MAKEFILE_COMMON := $(shell $(find-makefile-common)) | ||||
| 
 | ||||
| ifeq ($(MAKEFILE_COMMON),) | ||||
| # attempt a checkout
 | ||||
| define checkout-makefile-common | ||||
| test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 | ||||
| endef | ||||
| 
 | ||||
| MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) | ||||
| endif | ||||
| 
 | ||||
| include $(MAKEFILE_COMMON) | ||||
							
								
								
									
										10
									
								
								gating.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								gating.yaml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,10 @@ | ||||
| --- !Policy | ||||
| product_versions: | ||||
|   - rhel-9 | ||||
| decision_context: osci_compose_gate | ||||
| rules: | ||||
|   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} | ||||
|   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier2.functional} | ||||
|   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier3.functional} | ||||
|   - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.acceptance-tier.functional} | ||||
| 
 | ||||
							
								
								
									
										21
									
								
								macros.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								macros.php
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,21 @@ | ||||
| #
 | ||||
| # Interface versions exposed by PHP:
 | ||||
| # 
 | ||||
| %php_core_api @PHP_APIVER@ | ||||
| %php_zend_api @PHP_ZENDVER@ | ||||
| %php_pdo_api  @PHP_PDOVER@ | ||||
| %php_version  @PHP_VERSION@ | ||||
| 
 | ||||
| %php_extdir    %{_libdir}/php/modules | ||||
| %php_ztsextdir %{_libdir}/php-zts/modules | ||||
| 
 | ||||
| %php_inidir    %{_sysconfdir}/php.d | ||||
| %php_ztsinidir %{_sysconfdir}/php-zts.d | ||||
| 
 | ||||
| %php_incldir    %{_includedir}/php | ||||
| %php_ztsincldir %{_includedir}/php-zts/php | ||||
| 
 | ||||
| %__php         %{_bindir}/php | ||||
| %__ztsphp      %{_bindir}/zts-php | ||||
| 
 | ||||
| %pecl_xmldir   %{_sharedstatedir}/php/peclxml | ||||
							
								
								
									
										38
									
								
								news2markdown.php
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										38
									
								
								news2markdown.php
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,38 @@ | ||||
| #!/usr/bin/env php
 | ||||
| <?php | ||||
| if ($_SERVER['argc'] < 2) { | ||||
| 	die("Usage {$_SERVER['argv'][0]} /path/to/NEWS\n"); | ||||
| } | ||||
| 
 | ||||
| $text = file_get_contents($_SERVER['argv'][1]); | ||||
| if (!$text) { | ||||
| 	die("Can't read {$_SERVER['argv'][1]}\n"); | ||||
| } | ||||
| $debug = (isset($_SERVER['argv'][2]) && $_SERVER['argv'][2]==-'d'); | ||||
| 
 | ||||
| $text = explode("\n", $text); | ||||
| $in=false; | ||||
| foreach ($text as $line) { | ||||
| 	if (preg_match('/(^[0-9]+ .* 20[0-9][0-9])[,]* PHP (.*)$/', $line, $reg)) { | ||||
| 		if ($in) { | ||||
| 			break; | ||||
| 		} | ||||
| 		printf("**PHP version %s** (%s)", $reg[2], $reg[1]); | ||||
| 		$in = true; | ||||
| 		continue; | ||||
| 	} else if (!$in) { | ||||
| 		if ($debug) echo "+ Ignore $line\n"; | ||||
| 		continue; | ||||
| 	} | ||||
| 	$line = preg_replace('/(#[0-9])+/', 'php\1', $line); | ||||
| 	if (empty($line)) { | ||||
| 		echo "\n\n"; | ||||
| 	} else if (substr($line, 0, 2) == '- ') { | ||||
| 		echo "**" . substr($line, 2) . "**\n"; | ||||
| 	} else if (substr($line, 0, 4) == '  . ') { | ||||
| 		echo "\n* " . substr($line, 4); | ||||
| 	} else { | ||||
| 		echo " ".trim($line); | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
							
								
								
									
										6
									
								
								nginx-fpm.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								nginx-fpm.conf
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,6 @@ | ||||
| # PHP-FPM FastCGI server | ||||
| # network or unix domain socket configuration | ||||
| 
 | ||||
| upstream php-fpm { | ||||
|         server unix:/run/php-fpm/www.sock; | ||||
| } | ||||
							
								
								
									
										16
									
								
								nginx-php.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								nginx-php.conf
									
									
									
									
									
										Normal file
									
								
							| @ -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; | ||||
| } | ||||
							
								
								
									
										11
									
								
								opcache-default.blacklist
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								opcache-default.blacklist
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,11 @@ | ||||
| ; The blacklist file is a text file that holds the names of files | ||||
| ; that should not be accelerated. The file format is to add each filename | ||||
| ; to a new line. The filename may be a full path or just a file prefix | ||||
| ; (i.e., /var/www/x  blacklists all the files and directories in /var/www | ||||
| ; that start with 'x'). Line starting with a ; are ignored (comments). | ||||
| ; Files are usually triggered by one of the following three reasons: | ||||
| ; 1) Directories that contain auto generated code, like Smarty or ZFW cache. | ||||
| ; 2) Code that does not work well when accelerated, due to some delayed | ||||
| ;    compile time evaluation. | ||||
| ; 3) Code that triggers an OPcache bug. | ||||
| 
 | ||||
							
								
								
									
										11
									
								
								php-7.2.0-includedir.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								php-7.2.0-includedir.patch
									
									
									
									
									
										Normal file
									
								
							| @ -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 | ||||
							
								
								
									
										98
									
								
								php-7.4.0-datetests.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										98
									
								
								php-7.4.0-datetests.patch
									
									
									
									
									
										Normal file
									
								
							| @ -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" | ||||
							
								
								
									
										27
									
								
								php-7.4.0-httpd.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								php-7.4.0-httpd.patch
									
									
									
									
									
										Normal file
									
								
							| @ -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 | ||||
							
								
								
									
										19
									
								
								php-7.4.0-ldap_r.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								php-7.4.0-ldap_r.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,19 @@ | ||||
| 
 | ||||
| Use -lldap_r by default. | ||||
| 
 | ||||
| diff -up php-7.4.0RC2/ext/ldap/config.m4.ldap_r php-7.4.0RC2/ext/ldap/config.m4
 | ||||
| --- php-7.4.0RC2/ext/ldap/config.m4.ldap_r	2019-09-17 10:21:24.769200812 +0200
 | ||||
| +++ php-7.4.0RC2/ext/ldap/config.m4	2019-09-17 10:21:30.658181771 +0200
 | ||||
| @@ -68,7 +68,11 @@ if test "$PHP_LDAP" != "no"; then
 | ||||
|    dnl -pc removal is a hack for clang | ||||
|    MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//') | ||||
|   | ||||
| -  if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
 | ||||
| +  if test -f $LDAP_LIBDIR/libldap_r.$SHLIB_SUFFIX_NAME; then
 | ||||
| +    PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 | ||||
| +    PHP_ADD_LIBRARY_WITH_PATH(ldap_r, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 | ||||
| +
 | ||||
| +  elif test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then
 | ||||
|      PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) | ||||
|      PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) | ||||
|   | ||||
							
								
								
									
										92
									
								
								php-7.4.0-libdb.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										92
									
								
								php-7.4.0-libdb.patch
									
									
									
									
									
										Normal file
									
								
							| @ -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); | ||||
| @@ -459,6 +463,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)); | ||||
							
								
								
									
										35
									
								
								php-7.4.0-phpize.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								php-7.4.0-phpize.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,35 @@ | ||||
| diff -up ./scripts/phpize.in.headers ./scripts/phpize.in
 | ||||
| --- ./scripts/phpize.in.headers	2019-07-23 10:05:11.000000000 +0200
 | ||||
| +++ ./scripts/phpize.in	2019-07-23 10:18:13.648098089 +0200
 | ||||
| @@ -165,6 +165,15 @@ phpize_autotools()
 | ||||
|    $PHP_AUTOHEADER || exit 1 | ||||
|  } | ||||
|   | ||||
| +phpize_check_headers()
 | ||||
| +{
 | ||||
| +  if test ! -f $includedir/main/php.h; then
 | ||||
| +    echo "Can't find PHP headers in $includedir"
 | ||||
| +    echo "The php-devel package is required for use of this command."
 | ||||
| +    exit 1
 | ||||
| +  fi
 | ||||
| +}
 | ||||
| +
 | ||||
|  # Main script | ||||
|   | ||||
|  case "$1" in | ||||
| @@ -183,12 +192,15 @@ case "$1" in
 | ||||
|   | ||||
|    # Version | ||||
|    --version|-v) | ||||
| +    phpize_check_headers
 | ||||
|      phpize_print_api_numbers | ||||
|      exit 0 | ||||
|    ;; | ||||
|   | ||||
|    # Default | ||||
|    *) | ||||
| +     phpize_check_headers
 | ||||
| +
 | ||||
|       phpize_check_configm4 0 | ||||
|   | ||||
|       phpize_check_build_files | ||||
							
								
								
									
										25
									
								
								php-8.0.0-embed.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								php-8.0.0-embed.patch
									
									
									
									
									
										Normal file
									
								
							| @ -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@" | ||||
|   | ||||
							
								
								
									
										118
									
								
								php-8.0.0-phpinfo.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										118
									
								
								php-8.0.0-phpinfo.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,118 @@ | ||||
| 
 | ||||
| Drop "Configure Command" from phpinfo as it doesn't | ||||
| provide any useful information. | ||||
| The available extensions are not related to this command. | ||||
| 
 | ||||
| Replace full GCC name by gcc in php -v output | ||||
| 
 | ||||
| 
 | ||||
| Also apply | ||||
| 
 | ||||
| From 9bf43c45908433d382f0499d529849172d0d8206 Mon Sep 17 00:00:00 2001 | ||||
| From: Remi Collet <remi@remirepo.net> | ||||
| Date: Mon, 28 Dec 2020 08:33:09 +0100 | ||||
| Subject: [PATCH] rename COMPILER and ARCHITECTURE macro (too generic) | ||||
| 
 | ||||
| ---
 | ||||
|  configure.ac             |  4 ++-- | ||||
|  ext/standard/info.c      |  8 ++++---- | ||||
|  sapi/cli/php_cli.c       |  8 ++++---- | ||||
|  win32/build/confutils.js | 10 +++++----- | ||||
|  4 files changed, 15 insertions(+), 15 deletions(-) | ||||
| 
 | ||||
| diff --git a/configure.ac b/configure.ac
 | ||||
| index 9d9c8b155b07..143dc061346b 100644
 | ||||
| --- a/configure.ac
 | ||||
| +++ b/configure.ac
 | ||||
| @@ -1289,10 +1289,10 @@ if test -n "${PHP_BUILD_PROVIDER}"; then
 | ||||
|    AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider]) | ||||
|  fi | ||||
|  if test -n "${PHP_BUILD_COMPILER}"; then | ||||
| -  AC_DEFINE_UNQUOTED(COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
 | ||||
| +  AC_DEFINE_UNQUOTED(PHP_BUILD_COMPILER,"$PHP_BUILD_COMPILER",[used compiler for build])
 | ||||
|  fi | ||||
|  if test -n "${PHP_BUILD_ARCH}"; then | ||||
| -  AC_DEFINE_UNQUOTED(ARCHITECTURE,"$PHP_BUILD_ARCH",[build architecture])
 | ||||
| +  AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
 | ||||
|  fi | ||||
|   | ||||
|  PHP_SUBST_OLD(PHP_INSTALLED_SAPIS) | ||||
| diff --git a/ext/standard/info.c b/ext/standard/info.c
 | ||||
| index 153cb6cde014..8ceef31d9fe4 100644
 | ||||
| --- a/ext/standard/info.c
 | ||||
| +++ b/ext/standard/info.c
 | ||||
| @@ -798,11 +798,11 @@ PHPAPI ZEND_COLD void php_print_info(int flag)
 | ||||
|  #ifdef PHP_BUILD_PROVIDER | ||||
|  		php_info_print_table_row(2, "Build Provider", PHP_BUILD_PROVIDER); | ||||
|  #endif | ||||
| -#ifdef COMPILER
 | ||||
| -		php_info_print_table_row(2, "Compiler", COMPILER);
 | ||||
| +#ifdef PHP_BUILD_COMPILER
 | ||||
| +		php_info_print_table_row(2, "Compiler", PHP_BUILD_COMPILER);
 | ||||
|  #endif | ||||
| -#ifdef ARCHITECTURE
 | ||||
| -		php_info_print_table_row(2, "Architecture", ARCHITECTURE);
 | ||||
| +#ifdef PHP_BUILD_ARCH
 | ||||
| +		php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH);
 | ||||
|  #endif | ||||
|  #ifdef CONFIGURE_COMMAND | ||||
|  		php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); | ||||
| diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
 | ||||
| index 5092fb0ffd68..9d296acec631 100644
 | ||||
| --- a/sapi/cli/php_cli.c
 | ||||
| +++ b/sapi/cli/php_cli.c
 | ||||
| @@ -640,12 +640,12 @@ static int do_cli(int argc, char **argv) /* {{{ */
 | ||||
|  #else | ||||
|  					"NTS " | ||||
|  #endif | ||||
| -#ifdef COMPILER
 | ||||
| -					COMPILER
 | ||||
| +#ifdef PHP_BUILD_COMPILER
 | ||||
| +					PHP_BUILD_COMPILER
 | ||||
|  					" " | ||||
|  #endif | ||||
| -#ifdef ARCHITECTURE
 | ||||
| -					ARCHITECTURE
 | ||||
| +#ifdef PHP_BUILD_ARCH
 | ||||
| +					PHP_BUILD_ARCH
 | ||||
|  					" " | ||||
|  #endif | ||||
|  #if ZEND_DEBUG | ||||
| 
 | ||||
| diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c
 | ||||
| --- ./ext/standard/info.c.phpinfo	2020-07-21 10:49:31.000000000 +0200
 | ||||
| +++ ./ext/standard/info.c	2020-07-21 11:41:56.295633523 +0200
 | ||||
| @@ -804,9 +804,6 @@ PHPAPI ZEND_COLD void php_print_info(int
 | ||||
|  #ifdef PHP_BUILD_ARCH | ||||
|  		php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH); | ||||
|  #endif | ||||
| -#ifdef CONFIGURE_COMMAND
 | ||||
| -		php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
 | ||||
| -#endif
 | ||||
|   | ||||
|  		if (sapi_module.pretty_name) { | ||||
|  			php_info_print_table_row(2, "Server API", sapi_module.pretty_name ); | ||||
| diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/standard/tests/general_functions/phpinfo.phpt
 | ||||
| --- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo	2020-07-21 10:49:31.000000000 +0200
 | ||||
| +++ ./ext/standard/tests/general_functions/phpinfo.phpt	2020-07-21 11:41:56.296633522 +0200
 | ||||
| @@ -17,7 +17,6 @@ PHP Version => %s
 | ||||
|   | ||||
|  System => %s | ||||
|  Build Date => %s%a | ||||
| -Configure Command => %s
 | ||||
|  Server API => Command Line Interface | ||||
|  Virtual Directory Support => %s | ||||
|  Configuration File (php.ini) Path => %s | ||||
| diff -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c
 | ||||
| --- ./sapi/cli/php_cli.c.phpinfo	2020-07-21 11:43:38.812475300 +0200
 | ||||
| +++ ./sapi/cli/php_cli.c	2020-07-21 11:43:45.783464540 +0200
 | ||||
| @@ -641,8 +641,7 @@ static int do_cli(int argc, char **argv)
 | ||||
|  					"NTS " | ||||
|  #endif | ||||
|  #ifdef PHP_BUILD_COMPILER | ||||
| -					PHP_BUILD_COMPILER
 | ||||
| -					" "
 | ||||
| +					"gcc "
 | ||||
|  #endif | ||||
|  #ifdef PHP_BUILD_ARCH | ||||
|  					PHP_BUILD_ARCH | ||||
							
								
								
									
										515
									
								
								php-8.0.10-phar-sha.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										515
									
								
								php-8.0.10-phar-sha.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,515 @@ | ||||
| Backported for 8.0 from | ||||
| 
 | ||||
| 
 | ||||
| From 8bb0c74e24359a11216824117ac3adf3d5ef7b71 Mon Sep 17 00:00:00 2001 | ||||
| From: Remi Collet <remi@remirepo.net> | ||||
| Date: Thu, 5 Aug 2021 11:10:15 +0200 | ||||
| Subject: [PATCH] switch phar to use sha256 signature by default | ||||
| 
 | ||||
| ---
 | ||||
|  ext/phar/phar/pharcommand.inc                  | 2 +- | ||||
|  ext/phar/tests/create_new_and_modify.phpt      | 4 ++-- | ||||
|  ext/phar/tests/create_new_phar_c.phpt          | 4 ++-- | ||||
|  ext/phar/tests/phar_setsignaturealgo2.phpt     | 2 +- | ||||
|  ext/phar/tests/tar/phar_setsignaturealgo2.phpt | 2 +- | ||||
|  ext/phar/tests/zip/phar_setsignaturealgo2.phpt | 2 +- | ||||
|  ext/phar/util.c                                | 6 +++--- | ||||
|  ext/phar/zip.c                                 | 2 +- | ||||
|  8 files changed, 12 insertions(+), 12 deletions(-) | ||||
| 
 | ||||
| diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
 | ||||
| index a31290eee75fe..5f698b4bec26b 100644
 | ||||
| --- a/ext/phar/phar/pharcommand.inc
 | ||||
| +++ b/ext/phar/phar/pharcommand.inc
 | ||||
| @@ -92,7 +92,7 @@ class PharCommand extends CLICommand
 | ||||
|                  'typ' => 'select', | ||||
|                  'val' => NULL, | ||||
|                  'inf' => '<method> Selects the hash algorithm.', | ||||
| -                'select' => array('md5' => 'MD5','sha1' => 'SHA1')
 | ||||
| +                'select' => array('md5' => 'MD5','sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512', 'openssl' => 'OPENSSL')
 | ||||
|              ), | ||||
|              'i' => array( | ||||
|                  'typ' => 'regex', | ||||
| diff --git a/ext/phar/tests/create_new_and_modify.phpt b/ext/phar/tests/create_new_and_modify.phpt
 | ||||
| index 02e36c6cea2fe..32defcae8a639 100644
 | ||||
| --- a/ext/phar/tests/create_new_and_modify.phpt
 | ||||
| +++ b/ext/phar/tests/create_new_and_modify.phpt
 | ||||
| @@ -49,8 +49,8 @@ include $pname . '/b.php';
 | ||||
|  <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> | ||||
|  --EXPECTF-- | ||||
|  brand new! | ||||
| -string(40) "%s"
 | ||||
| -string(40) "%s"
 | ||||
| +string(%d) "%s"
 | ||||
| +string(%d) "%s"
 | ||||
|  bool(true) | ||||
|  modified! | ||||
|  another! | ||||
| diff --git a/ext/phar/tests/create_new_phar_c.phpt b/ext/phar/tests/create_new_phar_c.phpt
 | ||||
| index 566d3c4d5f8ad..bf6d740fd1d10 100644
 | ||||
| --- a/ext/phar/tests/create_new_phar_c.phpt
 | ||||
| +++ b/ext/phar/tests/create_new_phar_c.phpt
 | ||||
| @@ -20,7 +20,7 @@ var_dump($phar->getSignature());
 | ||||
|  --EXPECTF-- | ||||
|  array(2) { | ||||
|    ["hash"]=> | ||||
| -  string(40) "%s"
 | ||||
| +  string(64) "%s"
 | ||||
|    ["hash_type"]=> | ||||
| -  string(5) "SHA-1"
 | ||||
| +  string(7) "SHA-256"
 | ||||
|  } | ||||
| diff --git a/ext/phar/tests/phar_setsignaturealgo2.phpt b/ext/phar/tests/phar_setsignaturealgo2.phpt
 | ||||
| index 293d3196713d8..4f31836fbbbcc 100644
 | ||||
| --- a/ext/phar/tests/phar_setsignaturealgo2.phpt
 | ||||
| +++ b/ext/phar/tests/phar_setsignaturealgo2.phpt
 | ||||
| @@ -52,7 +52,7 @@ array(2) {
 | ||||
|    ["hash"]=> | ||||
|    string(%d) "%s" | ||||
|    ["hash_type"]=> | ||||
| -  string(5) "SHA-1"
 | ||||
| +  string(7) "SHA-256"
 | ||||
|  } | ||||
|  array(2) { | ||||
|    ["hash"]=> | ||||
| diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
 | ||||
| index 9923ac5c88476..cc10a241d739b 100644
 | ||||
| --- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
 | ||||
| +++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
 | ||||
| @@ -51,7 +51,7 @@ array(2) {
 | ||||
|    ["hash"]=> | ||||
|    string(%d) "%s" | ||||
|    ["hash_type"]=> | ||||
| -  string(5) "SHA-1"
 | ||||
| +  string(7) "SHA-256"
 | ||||
|  } | ||||
|  array(2) { | ||||
|    ["hash"]=> | ||||
| diff --git a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
 | ||||
| index 8de77479d7825..60fec578ee894 100644
 | ||||
| --- a/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
 | ||||
| +++ b/ext/phar/tests/zip/phar_setsignaturealgo2.phpt
 | ||||
| @@ -78,7 +78,7 @@ array(2) {
 | ||||
|    ["hash"]=> | ||||
|    string(%d) "%s" | ||||
|    ["hash_type"]=> | ||||
| -  string(5) "SHA-1"
 | ||||
| +  string(7) "SHA-256"
 | ||||
|  } | ||||
|  array(2) { | ||||
|    ["hash"]=> | ||||
| diff --git a/ext/phar/util.c b/ext/phar/util.c
 | ||||
| index 314acfe81a788..8d2db03b69601 100644
 | ||||
| --- a/ext/phar/util.c
 | ||||
| +++ b/ext/phar/util.c
 | ||||
| @@ -1798,6 +1798,8 @@ int phar_create_signature(phar_archive_d
 | ||||
|  			*signature_length = 64; | ||||
|  			break; | ||||
|  		} | ||||
| +		default:
 | ||||
| +			phar->sig_flags = PHAR_SIG_SHA256;
 | ||||
|  		case PHAR_SIG_SHA256: { | ||||
|  			unsigned char digest[32]; | ||||
|  			PHP_SHA256_CTX  context; | ||||
| @@ -1894,8 +1896,6 @@ int phar_create_signature(phar_archive_d
 | ||||
|  			*signature_length = siglen; | ||||
|  		} | ||||
|  		break; | ||||
| -		default:
 | ||||
| -			phar->sig_flags = PHAR_SIG_SHA1;
 | ||||
|  		case PHAR_SIG_SHA1: { | ||||
|  			unsigned char digest[20]; | ||||
|  			PHP_SHA1_CTX  context; | ||||
| diff --git a/ext/phar/zip.c b/ext/phar/zip.c
 | ||||
| index 31d4bd2998215..c5e38cabf7b87 100644
 | ||||
| --- a/ext/phar/zip.c
 | ||||
| +++ b/ext/phar/zip.c
 | ||||
| @@ -1423,7 +1423,7 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, zend_long len, int
 | ||||
|   | ||||
|  	memcpy(eocd.signature, "PK\5\6", 4); | ||||
|  	if (!phar->is_data && !phar->sig_flags) { | ||||
| -		phar->sig_flags = PHAR_SIG_SHA1;
 | ||||
| +		phar->sig_flags = PHAR_SIG_SHA256;
 | ||||
|  	} | ||||
|  	if (phar->sig_flags) { | ||||
|  		PHAR_SET_16(eocd.counthere, zend_hash_num_elements(&phar->manifest) + 1); | ||||
| 
 | ||||
| From c51af22fef988c1b2f92b7b9e3a9d745f7084815 Mon Sep 17 00:00:00 2001 | ||||
| From: Remi Collet <remi@remirepo.net> | ||||
| Date: Thu, 5 Aug 2021 16:49:48 +0200 | ||||
| Subject: [PATCH] implement openssl_256 and openssl_512 for phar singatures | ||||
| 
 | ||||
| ---
 | ||||
|  ext/openssl/openssl.c                         |   1 + | ||||
|  ext/phar/phar.1.in                            |  10 +++- | ||||
|  ext/phar/phar.c                               |   8 +++- | ||||
|  ext/phar/phar/pharcommand.inc                 |  14 +++++- | ||||
|  ext/phar/phar_internal.h                      |   2 + | ||||
|  ext/phar/phar_object.c                        |  24 ++++++++-- | ||||
|  ext/phar/tests/files/openssl256.phar          | Bin 0 -> 7129 bytes | ||||
|  ext/phar/tests/files/openssl256.phar.pubkey   |   6 +++ | ||||
|  ext/phar/tests/files/openssl512.phar          | Bin 0 -> 7129 bytes | ||||
|  ext/phar/tests/files/openssl512.phar.pubkey   |   6 +++ | ||||
|  .../phar_get_supported_signatures_002a.phpt   |   6 ++- | ||||
|  .../tests/tar/phar_setsignaturealgo2.phpt     |  16 +++++++ | ||||
|  ext/phar/tests/test_signaturealgos.phpt       |   8 ++++ | ||||
|  ext/phar/util.c                               |  45 ++++++++++++++---- | ||||
|  14 files changed, 128 insertions(+), 18 deletions(-) | ||||
|  create mode 100644 ext/phar/tests/files/openssl256.phar | ||||
|  create mode 100644 ext/phar/tests/files/openssl256.phar.pubkey | ||||
|  create mode 100644 ext/phar/tests/files/openssl512.phar | ||||
|  create mode 100644 ext/phar/tests/files/openssl512.phar.pubkey | ||||
| 
 | ||||
| diff --git a/ext/phar/phar.1.in b/ext/phar/phar.1.in
 | ||||
| index 77912b241dfd5..323e77b0e2a3b 100644
 | ||||
| --- a/ext/phar/phar.1.in
 | ||||
| +++ b/ext/phar/phar.1.in
 | ||||
| @@ -475,7 +475,15 @@ SHA512
 | ||||
|  .TP | ||||
|  .PD | ||||
|  .B openssl | ||||
| -OpenSSL
 | ||||
| +OpenSSL using SHA-1
 | ||||
| +.TP
 | ||||
| +.PD
 | ||||
| +.B openssl_sha256
 | ||||
| +OpenSSL using SHA-256
 | ||||
| +.TP
 | ||||
| +.PD
 | ||||
| +.B openssl_sha512
 | ||||
| +OpenSSL using SHA-512
 | ||||
|   | ||||
|  .SH SEE ALSO | ||||
|  For a more or less complete description of PHAR look here: | ||||
| diff --git a/ext/phar/phar.c b/ext/phar/phar.c
 | ||||
| index 77f21cef9da53..bc08e4edde05d 100644
 | ||||
| --- a/ext/phar/phar.c
 | ||||
| +++ b/ext/phar/phar.c
 | ||||
| @@ -869,6 +869,8 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, size_t fname_len, ch
 | ||||
|  		PHAR_GET_32(sig_ptr, sig_flags); | ||||
|   | ||||
|  		switch(sig_flags) { | ||||
| +			case PHAR_SIG_OPENSSL_SHA512:
 | ||||
| +			case PHAR_SIG_OPENSSL_SHA256:
 | ||||
|  			case PHAR_SIG_OPENSSL: { | ||||
|  				uint32_t signature_len; | ||||
|  				char *sig; | ||||
| @@ -903,7 +905,7 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, size_t fname_len, ch
 | ||||
|  					return FAILURE; | ||||
|  				} | ||||
|   | ||||
| -				if (FAILURE == phar_verify_signature(fp, end_of_phar, PHAR_SIG_OPENSSL, sig, signature_len, fname, &signature, &sig_len, error)) {
 | ||||
| +				if (FAILURE == phar_verify_signature(fp, end_of_phar, sig_flags, sig, signature_len, fname, &signature, &sig_len, error)) {
 | ||||
|  					efree(savebuf); | ||||
|  					efree(sig); | ||||
|  					php_stream_close(fp); | ||||
| @@ -3162,7 +3164,9 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
 | ||||
|   | ||||
|  				php_stream_write(newfile, digest, digest_len); | ||||
|  				efree(digest); | ||||
| -				if (phar->sig_flags == PHAR_SIG_OPENSSL) {
 | ||||
| +				if (phar->sig_flags == PHAR_SIG_OPENSSL ||
 | ||||
| +					phar->sig_flags == PHAR_SIG_OPENSSL_SHA256 ||
 | ||||
| +					phar->sig_flags == PHAR_SIG_OPENSSL_SHA512) {
 | ||||
|  					phar_set_32(sig_buf, digest_len); | ||||
|  					php_stream_write(newfile, sig_buf, 4); | ||||
|  				} | ||||
| diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
 | ||||
| index 5f698b4bec26b..1b1eeca59c560 100644
 | ||||
| --- a/ext/phar/phar/pharcommand.inc
 | ||||
| +++ b/ext/phar/phar/pharcommand.inc
 | ||||
| @@ -92,7 +92,7 @@ class PharCommand extends CLICommand
 | ||||
|                  'typ' => 'select', | ||||
|                  'val' => NULL, | ||||
|                  'inf' => '<method> Selects the hash algorithm.', | ||||
| -                'select' => array('md5' => 'MD5','sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512', 'openssl' => 'OPENSSL')
 | ||||
| +                'select' => ['md5' => 'MD5','sha1' => 'SHA1', 'sha256' => 'SHA256', 'sha512' => 'SHA512', 'openssl' => 'OPENSSL', 'openssl_sha256' => 'OPENSSL_SHA256', 'openssl_sha512' => 'OPENSSL_SHA512']
 | ||||
|              ), | ||||
|              'i' => array( | ||||
|                  'typ' => 'regex', | ||||
| @@ -156,6 +156,8 @@ class PharCommand extends CLICommand
 | ||||
|          $hash_avail = Phar::getSupportedSignatures(); | ||||
|          $hash_optional = array('SHA-256' => 'SHA256', | ||||
|                                 'SHA-512' => 'SHA512', | ||||
| +                               'OpenSSL_sha256' => 'OpenSSL_SHA256',
 | ||||
| +                               'OpenSSL_sha512' => 'OpenSSL_SHA512',
 | ||||
|                                 'OpenSSL' => 'OpenSSL'); | ||||
|          if (!in_array('OpenSSL', $hash_avail)) { | ||||
|              unset($phar_args['y']); | ||||
| @@ -429,6 +431,16 @@ class PharCommand extends CLICommand
 | ||||
|                      self::error("Cannot use OpenSSL signing without key.\n"); | ||||
|                  } | ||||
|                  return Phar::OPENSSL; | ||||
| +            case 'openssl_sha256':
 | ||||
| +                if (!$privkey) {
 | ||||
| +                    self::error("Cannot use OpenSSL signing without key.\n");
 | ||||
| +                }
 | ||||
| +                return Phar::OPENSSL_SHA256;
 | ||||
| +            case 'openssl_sha512':
 | ||||
| +                if (!$privkey) {
 | ||||
| +                    self::error("Cannot use OpenSSL signing without key.\n");
 | ||||
| +                }
 | ||||
| +                return Phar::OPENSSL_SHA512;
 | ||||
|          } | ||||
|      } | ||||
|      // }}} | ||||
| diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
 | ||||
| index a9f81e2ab994a..30b408a8c4462 100644
 | ||||
| --- a/ext/phar/phar_internal.h
 | ||||
| +++ b/ext/phar/phar_internal.h
 | ||||
| @@ -88,6 +88,8 @@
 | ||||
|  #define PHAR_SIG_SHA256           0x0003 | ||||
|  #define PHAR_SIG_SHA512           0x0004 | ||||
|  #define PHAR_SIG_OPENSSL          0x0010 | ||||
| +#define PHAR_SIG_OPENSSL_SHA256   0x0011
 | ||||
| +#define PHAR_SIG_OPENSSL_SHA512   0x0012
 | ||||
|   | ||||
|  /* flags byte for each file adheres to these bitmasks. | ||||
|     All unused values are reserved */ | ||||
| diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
 | ||||
| index 9c1e5f2fa1eef..c05970e657f18 100644
 | ||||
| --- a/ext/phar/phar_object.c
 | ||||
| +++ b/ext/phar/phar_object.c
 | ||||
| @@ -1246,9 +1246,13 @@ PHP_METHOD(Phar, getSupportedSignatures)
 | ||||
|  	add_next_index_stringl(return_value, "SHA-512", 7); | ||||
|  #ifdef PHAR_HAVE_OPENSSL | ||||
|  	add_next_index_stringl(return_value, "OpenSSL", 7); | ||||
| +	add_next_index_stringl(return_value, "OpenSSL_SHA256", 14);
 | ||||
| +	add_next_index_stringl(return_value, "OpenSSL_SHA512", 14);
 | ||||
|  #else | ||||
|  	if (zend_hash_str_exists(&module_registry, "openssl", sizeof("openssl")-1)) { | ||||
|  		add_next_index_stringl(return_value, "OpenSSL", 7); | ||||
| +		add_next_index_stringl(return_value, "OpenSSL_SHA256", 14);
 | ||||
| +		add_next_index_stringl(return_value, "OpenSSL_SHA512", 14);
 | ||||
|  	} | ||||
|  #endif | ||||
|  } | ||||
| @@ -3028,6 +3032,8 @@ PHP_METHOD(Phar, setSignatureAlgorithm)
 | ||||
|  		case PHAR_SIG_MD5: | ||||
|  		case PHAR_SIG_SHA1: | ||||
|  		case PHAR_SIG_OPENSSL: | ||||
| +		case PHAR_SIG_OPENSSL_SHA256:
 | ||||
| +		case PHAR_SIG_OPENSSL_SHA512:
 | ||||
|  			if (phar_obj->archive->is_persistent && FAILURE == phar_copy_on_write(&(phar_obj->archive))) { | ||||
|  				zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%s\" is persistent, unable to copy on write", phar_obj->archive->fname); | ||||
|  				RETURN_THROWS(); | ||||
| @@ -3066,19 +3072,25 @@ PHP_METHOD(Phar, getSignature)
 | ||||
|  		add_assoc_stringl(return_value, "hash", phar_obj->archive->signature, phar_obj->archive->sig_len); | ||||
|  		switch(phar_obj->archive->sig_flags) { | ||||
|  			case PHAR_SIG_MD5: | ||||
| -				add_assoc_stringl(return_value, "hash_type", "MD5", 3);
 | ||||
| +				add_assoc_string(return_value, "hash_type", "MD5");
 | ||||
|  				break; | ||||
|  			case PHAR_SIG_SHA1: | ||||
| -				add_assoc_stringl(return_value, "hash_type", "SHA-1", 5);
 | ||||
| +				add_assoc_string(return_value, "hash_type", "SHA-1");
 | ||||
|  				break; | ||||
|  			case PHAR_SIG_SHA256: | ||||
| -				add_assoc_stringl(return_value, "hash_type", "SHA-256", 7);
 | ||||
| +				add_assoc_string(return_value, "hash_type", "SHA-256");
 | ||||
|  				break; | ||||
|  			case PHAR_SIG_SHA512: | ||||
| -				add_assoc_stringl(return_value, "hash_type", "SHA-512", 7);
 | ||||
| +				add_assoc_string(return_value, "hash_type", "SHA-512");
 | ||||
|  				break; | ||||
|  			case PHAR_SIG_OPENSSL: | ||||
| -				add_assoc_stringl(return_value, "hash_type", "OpenSSL", 7);
 | ||||
| +				add_assoc_string(return_value, "hash_type", "OpenSSL");
 | ||||
| +				break;
 | ||||
| +			case PHAR_SIG_OPENSSL_SHA256:
 | ||||
| +				add_assoc_string(return_value, "hash_type", "OpenSSL_SHA256");
 | ||||
| +				break;
 | ||||
| +			case PHAR_SIG_OPENSSL_SHA512:
 | ||||
| +				add_assoc_string(return_value, "hash_type", "OpenSSL_SHA512");
 | ||||
|  				break; | ||||
|  			default: | ||||
|  				unknown = strpprintf(0, "Unknown (%u)", phar_obj->archive->sig_flags); | ||||
| @@ -5103,6 +5115,8 @@ void phar_object_init(void) /* {{{ */
 | ||||
|  	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "PHPS", PHAR_MIME_PHPS) | ||||
|  	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "MD5", PHAR_SIG_MD5) | ||||
|  	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "OPENSSL", PHAR_SIG_OPENSSL) | ||||
| +	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "OPENSSL_SHA256", PHAR_SIG_OPENSSL_SHA256)
 | ||||
| +	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "OPENSSL_SHA512", PHAR_SIG_OPENSSL_SHA512)
 | ||||
|  	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "SHA1", PHAR_SIG_SHA1) | ||||
|  	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "SHA256", PHAR_SIG_SHA256) | ||||
|  	REGISTER_PHAR_CLASS_CONST_LONG(phar_ce_archive, "SHA512", PHAR_SIG_SHA512) | ||||
| diff --git a/ext/phar/tests/phar_get_supported_signatures_002a.phpt b/ext/phar/tests/phar_get_supported_signatures_002a.phpt
 | ||||
| index 06d811f2c35c2..639143b3d2c90 100644
 | ||||
| --- a/ext/phar/tests/phar_get_supported_signatures_002a.phpt
 | ||||
| +++ b/ext/phar/tests/phar_get_supported_signatures_002a.phpt
 | ||||
| @@ -14,7 +14,7 @@ phar.readonly=0
 | ||||
|  var_dump(Phar::getSupportedSignatures()); | ||||
|  ?> | ||||
|  --EXPECT-- | ||||
| -array(5) {
 | ||||
| +array(7) {
 | ||||
|    [0]=> | ||||
|    string(3) "MD5" | ||||
|    [1]=> | ||||
| @@ -25,4 +25,8 @@ array(5) {
 | ||||
|    string(7) "SHA-512" | ||||
|    [4]=> | ||||
|    string(7) "OpenSSL" | ||||
| +  [5]=>
 | ||||
| +  string(14) "OpenSSL_SHA256"
 | ||||
| +  [6]=>
 | ||||
| +  string(14) "OpenSSL_SHA512"
 | ||||
|  } | ||||
| diff --git a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
 | ||||
| index cc10a241d739b..c2eb5d77a5bf0 100644
 | ||||
| --- a/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
 | ||||
| +++ b/ext/phar/tests/tar/phar_setsignaturealgo2.phpt
 | ||||
| @@ -38,6 +38,10 @@ $pkey = '';
 | ||||
|  openssl_pkey_export($private, $pkey, NULL, $config_arg); | ||||
|  $p->setSignatureAlgorithm(Phar::OPENSSL, $pkey); | ||||
|  var_dump($p->getSignature()); | ||||
| +$p->setSignatureAlgorithm(Phar::OPENSSL_SHA512, $pkey);
 | ||||
| +var_dump($p->getSignature());
 | ||||
| +$p->setSignatureAlgorithm(Phar::OPENSSL_SHA256, $pkey);
 | ||||
| +var_dump($p->getSignature());
 | ||||
|  } catch (Exception $e) { | ||||
|  echo $e->getMessage(); | ||||
|  } | ||||
| @@ -83,3 +87,15 @@ array(2) {
 | ||||
|    ["hash_type"]=> | ||||
|    string(7) "OpenSSL" | ||||
|  } | ||||
| +array(2) {
 | ||||
| +  ["hash"]=>
 | ||||
| +  string(%d) "%s"
 | ||||
| +  ["hash_type"]=>
 | ||||
| +  string(14) "OpenSSL_SHA512"
 | ||||
| +}
 | ||||
| +array(2) {
 | ||||
| +  ["hash"]=>
 | ||||
| +  string(%d) "%s"
 | ||||
| +  ["hash_type"]=>
 | ||||
| +  string(14) "OpenSSL_SHA256"
 | ||||
| +}
 | ||||
| diff --git a/ext/phar/util.c b/ext/phar/util.c
 | ||||
| index 8d2db03b69601..515830bf2c70a 100644
 | ||||
| --- a/ext/phar/util.c
 | ||||
| +++ b/ext/phar/util.c
 | ||||
| @@ -34,7 +34,7 @@
 | ||||
|  #include <openssl/ssl.h> | ||||
|  #include <openssl/pkcs12.h> | ||||
|  #else | ||||
| -static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len);
 | ||||
| +static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, php_uint32 sig_type);
 | ||||
|  #endif | ||||
|   | ||||
|  /* for links to relative location, prepend cwd of the entry */ | ||||
| @@ -1381,11 +1381,11 @@ static int phar_hex_str(const char *digest, size_t digest_len, char **signature)
 | ||||
|  /* }}} */ | ||||
|   | ||||
|  #ifndef PHAR_HAVE_OPENSSL | ||||
| -static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len) /* {{{ */
 | ||||
| +static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, php_uint32 sig_type) /* {{{ */
 | ||||
|  { | ||||
|  	zend_fcall_info fci; | ||||
|  	zend_fcall_info_cache fcc; | ||||
| -	zval retval, zp[3], openssl;
 | ||||
| +	zval retval, zp[4], openssl;
 | ||||
|  	zend_string *str; | ||||
|   | ||||
|  	ZVAL_STRINGL(&openssl, is_sign ? "openssl_sign" : "openssl_verify", is_sign ? sizeof("openssl_sign")-1 : sizeof("openssl_verify")-1); | ||||
| @@ -1402,6 +1402,14 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t
 | ||||
|  	} else { | ||||
|  		ZVAL_EMPTY_STRING(&zp[0]); | ||||
|  	} | ||||
| +	if (sig_type == PHAR_SIG_OPENSSL_SHA512) {
 | ||||
| +		ZVAL_LONG(&zp[3], 9); /* value from openssl.c #define OPENSSL_ALGO_SHA512 9 */
 | ||||
| +	} else if (sig_type == PHAR_SIG_OPENSSL_SHA256) {
 | ||||
| +		ZVAL_LONG(&zp[3], 7); /* value from openssl.c #define OPENSSL_ALGO_SHA256 7 */
 | ||||
| +	} else {
 | ||||
| +		/* don't rely on default value which may change in the future */
 | ||||
| +		ZVAL_LONG(&zp[3], 1); /* value from openssl.c #define OPENSSL_ALGO_SHA1   1 */
 | ||||
| +	}
 | ||||
|   | ||||
|  	if ((size_t)end != Z_STRLEN(zp[0])) { | ||||
|  		zval_ptr_dtor_str(&zp[0]); | ||||
| @@ -1419,7 +1427,7 @@ static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t
 | ||||
|  		return FAILURE; | ||||
|  	} | ||||
|   | ||||
| -	fci.param_count = 3;
 | ||||
| +	fci.param_count = 4;
 | ||||
|  	fci.params = zp; | ||||
|  	Z_ADDREF(zp[0]); | ||||
|  	if (is_sign) { | ||||
| @@ -1482,12 +1490,22 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type,
 | ||||
|  	php_stream_rewind(fp); | ||||
|   | ||||
|  	switch (sig_type) { | ||||
| +		case PHAR_SIG_OPENSSL_SHA512:
 | ||||
| +		case PHAR_SIG_OPENSSL_SHA256:
 | ||||
|  		case PHAR_SIG_OPENSSL: { | ||||
|  #ifdef PHAR_HAVE_OPENSSL | ||||
|  			BIO *in; | ||||
|  			EVP_PKEY *key; | ||||
| -			EVP_MD *mdtype = (EVP_MD *) EVP_sha1();
 | ||||
| +			const EVP_MD *mdtype;
 | ||||
|  			EVP_MD_CTX *md_ctx; | ||||
| +
 | ||||
| +			if (sig_type == PHAR_SIG_OPENSSL_SHA512) {
 | ||||
| +				mdtype = EVP_sha512();
 | ||||
| +			} else if (sig_type == PHAR_SIG_OPENSSL_SHA256) {
 | ||||
| +				mdtype = EVP_sha256();
 | ||||
| +			} else {
 | ||||
| +				mdtype = EVP_sha1();
 | ||||
| +			}
 | ||||
|  #else | ||||
|  			size_t tempsig; | ||||
|  #endif | ||||
| @@ -1521,7 +1539,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type,
 | ||||
|  #ifndef PHAR_HAVE_OPENSSL | ||||
|  			tempsig = sig_len; | ||||
|   | ||||
| -			if (FAILURE == phar_call_openssl_signverify(0, fp, end_of_phar, pubkey ? ZSTR_VAL(pubkey) : NULL, pubkey ? ZSTR_LEN(pubkey) : 0, &sig, &tempsig)) {
 | ||||
| +			if (FAILURE == phar_call_openssl_signverify(0, fp, end_of_phar, pubkey ? ZSTR_VAL(pubkey) : NULL, pubkey ? ZSTR_LEN(pubkey) : 0, &sig, &tempsig, sig_type)) {
 | ||||
|  				if (pubkey) { | ||||
|  					zend_string_release_ex(pubkey, 0); | ||||
|  				} | ||||
| @@ -1815,6 +1833,8 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
 | ||||
|  			*signature_length = 32; | ||||
|  			break; | ||||
|  		} | ||||
| +		case PHAR_SIG_OPENSSL_SHA512:
 | ||||
| +		case PHAR_SIG_OPENSSL_SHA256:
 | ||||
|  		case PHAR_SIG_OPENSSL: { | ||||
|  			unsigned char *sigbuf; | ||||
|  #ifdef PHAR_HAVE_OPENSSL | ||||
| @@ -1822,6 +1842,15 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
 | ||||
|  			BIO *in; | ||||
|  			EVP_PKEY *key; | ||||
|  			EVP_MD_CTX *md_ctx; | ||||
| +			const EVP_MD *mdtype;
 | ||||
| +
 | ||||
| +			if (phar->sig_flags == PHAR_SIG_OPENSSL_SHA512) {
 | ||||
| +				mdtype = EVP_sha512();
 | ||||
| +			} else if (phar->sig_flags == PHAR_SIG_OPENSSL_SHA256) {
 | ||||
| +				mdtype = EVP_sha256();
 | ||||
| +			} else {
 | ||||
| +				mdtype = EVP_sha1();
 | ||||
| +			}
 | ||||
|   | ||||
|  			in = BIO_new_mem_buf(PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len)); | ||||
|   | ||||
| @@ -1847,7 +1876,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
 | ||||
|  			siglen = EVP_PKEY_size(key); | ||||
|  			sigbuf = emalloc(siglen + 1); | ||||
|   | ||||
| -			if (!EVP_SignInit(md_ctx, EVP_sha1())) {
 | ||||
| +			if (!EVP_SignInit(md_ctx, mdtype)) {
 | ||||
|  				EVP_PKEY_free(key); | ||||
|  				efree(sigbuf); | ||||
|  				if (error) { | ||||
| @@ -1885,7 +1914,7 @@ int phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signat
 | ||||
|  			siglen = 0; | ||||
|  			php_stream_seek(fp, 0, SEEK_END); | ||||
|   | ||||
| -			if (FAILURE == phar_call_openssl_signverify(1, fp, php_stream_tell(fp), PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len), (char **)&sigbuf, &siglen)) {
 | ||||
| +			if (FAILURE == phar_call_openssl_signverify(1, fp, php_stream_tell(fp), PHAR_G(openssl_privatekey), PHAR_G(openssl_privatekey_len), (char **)&sigbuf, &siglen, phar->sig_flags)) {
 | ||||
|  				if (error) { | ||||
|  					spprintf(error, 0, "unable to write phar \"%s\" with requested openssl signature", phar->fname); | ||||
|  				} | ||||
							
								
								
									
										143
									
								
								php-8.0.10-snmp-sha.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										143
									
								
								php-8.0.10-snmp-sha.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,143 @@ | ||||
| Backported for 8.0 from | ||||
| 
 | ||||
| 
 | ||||
| From 718e91343fddb8817a004f96f111c424843bf746 Mon Sep 17 00:00:00 2001 | ||||
| From: Remi Collet <remi@php.net> | ||||
| Date: Wed, 11 Aug 2021 13:02:18 +0200 | ||||
| Subject: [PATCH] add SHA256 and SHA512 for security protocol | ||||
| 
 | ||||
| ---
 | ||||
|  ext/snmp/config.m4                            | 18 +++++++++- | ||||
|  ext/snmp/snmp.c                               | 33 ++++++++++++++++++- | ||||
|  .../tests/snmp-object-setSecurity_error.phpt  |  2 +- | ||||
|  ext/snmp/tests/snmp3-error.phpt               |  2 +- | ||||
|  4 files changed, 51 insertions(+), 4 deletions(-) | ||||
| 
 | ||||
| diff --git a/ext/snmp/config.m4 b/ext/snmp/config.m4
 | ||||
| index 1475ddfe2b7f0..f285a572de9cb 100644
 | ||||
| --- a/ext/snmp/config.m4
 | ||||
| +++ b/ext/snmp/config.m4
 | ||||
| @@ -30,7 +30,7 @@ if test "$PHP_SNMP" != "no"; then
 | ||||
|          AC_MSG_ERROR([Could not find the required paths. Please check your net-snmp installation.]) | ||||
|        fi | ||||
|      else | ||||
| -      AC_MSG_ERROR([Net-SNMP version 5.3 or greater reqired (detected $snmp_full_version).])
 | ||||
| +      AC_MSG_ERROR([Net-SNMP version 5.3 or greater required (detected $snmp_full_version).])
 | ||||
|      fi | ||||
|    else | ||||
|      AC_MSG_ERROR([Could not find net-snmp-config binary. Please check your net-snmp installation.]) | ||||
| @@ -54,6 +54,22 @@ if test "$PHP_SNMP" != "no"; then
 | ||||
|      $SNMP_SHARED_LIBADD | ||||
|    ]) | ||||
|   | ||||
| +  dnl Check whether usmHMAC192SHA256AuthProtocol exists.
 | ||||
| +  PHP_CHECK_LIBRARY($SNMP_LIBNAME, usmHMAC192SHA256AuthProtocol,
 | ||||
| +  [
 | ||||
| +    AC_DEFINE(HAVE_SNMP_SHA256, 1, [ ])
 | ||||
| +  ], [], [
 | ||||
| +    $SNMP_SHARED_LIBADD
 | ||||
| +  ])
 | ||||
| +
 | ||||
| +  dnl Check whether usmHMAC384SHA512AuthProtocol exists.
 | ||||
| +  PHP_CHECK_LIBRARY($SNMP_LIBNAME, usmHMAC384SHA512AuthProtocol,
 | ||||
| +  [
 | ||||
| +    AC_DEFINE(HAVE_SNMP_SHA512, 1, [ ])
 | ||||
| +  ], [], [
 | ||||
| +    $SNMP_SHARED_LIBADD
 | ||||
| +  ])
 | ||||
| +
 | ||||
|    PHP_NEW_EXTENSION(snmp, snmp.c, $ext_shared) | ||||
|    PHP_SUBST(SNMP_SHARED_LIBADD) | ||||
|  fi | ||||
| diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
 | ||||
| index 69d6549405b17..f0917501751f5 100644
 | ||||
| --- a/ext/snmp/snmp.c
 | ||||
| +++ b/ext/snmp/snmp.c
 | ||||
| @@ -29,6 +29,7 @@
 | ||||
|  #include "php_snmp.h" | ||||
|   | ||||
|  #include "zend_exceptions.h" | ||||
| +#include "zend_smart_string.h"
 | ||||
|  #include "ext/spl/spl_exceptions.h" | ||||
|  #include "snmp_arginfo.h" | ||||
|   | ||||
| @@ -938,16 +939,48 @@ static int netsnmp_session_set_auth_protocol(struct snmp_session *s, char *prot)
 | ||||
|  	if (!strcasecmp(prot, "MD5")) { | ||||
|  		s->securityAuthProto = usmHMACMD5AuthProtocol; | ||||
|  		s->securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN; | ||||
| -	} else
 | ||||
| +		return 0;
 | ||||
| +	}
 | ||||
|  #endif | ||||
| +
 | ||||
|  	if (!strcasecmp(prot, "SHA")) { | ||||
|  		s->securityAuthProto = usmHMACSHA1AuthProtocol; | ||||
|  		s->securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN; | ||||
| -	} else {
 | ||||
| -		zend_value_error("Authentication protocol must be either \"MD5\" or \"SHA\"");
 | ||||
| -		return (-1);
 | ||||
| +		return 0;
 | ||||
|  	} | ||||
| -	return (0);
 | ||||
| +
 | ||||
| +#ifdef HAVE_SNMP_SHA256
 | ||||
| +	if (!strcasecmp(prot, "SHA256")) {
 | ||||
| +		s->securityAuthProto = usmHMAC192SHA256AuthProtocol;
 | ||||
| +		s->securityAuthProtoLen = sizeof(usmHMAC192SHA256AuthProtocol) / sizeof(oid);
 | ||||
| +		return 0;
 | ||||
| +	}
 | ||||
| +#endif
 | ||||
| +
 | ||||
| +#ifdef HAVE_SNMP_SHA512
 | ||||
| +	if (!strcasecmp(prot, "SHA512")) {
 | ||||
| +		s->securityAuthProto = usmHMAC384SHA512AuthProtocol;
 | ||||
| +		s->securityAuthProtoLen = sizeof(usmHMAC384SHA512AuthProtocol) / sizeof(oid);
 | ||||
| +		return 0;
 | ||||
| +	}
 | ||||
| +#endif
 | ||||
| +
 | ||||
| +	smart_string err = {0};
 | ||||
| +
 | ||||
| +	smart_string_appends(&err, "Authentication protocol must be \"SHA\"");
 | ||||
| +#ifdef HAVE_SNMP_SHA256
 | ||||
| +	smart_string_appends(&err, " or \"SHA256\"");
 | ||||
| +#endif
 | ||||
| +#ifdef HAVE_SNMP_SHA512
 | ||||
| +	smart_string_appends(&err, " or \"SHA512\"");
 | ||||
| +#endif
 | ||||
| +#ifndef DISABLE_MD5
 | ||||
| +	smart_string_appends(&err, " or \"MD5\"");
 | ||||
| +#endif
 | ||||
| +	smart_string_0(&err);
 | ||||
| +	zend_value_error("%s", err.c);
 | ||||
| +	smart_string_free(&err);
 | ||||
| +	return -1;
 | ||||
|  } | ||||
|  /* }}} */ | ||||
|   | ||||
| diff --git a/ext/snmp/tests/snmp-object-setSecurity_error.phpt b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
 | ||||
| index f8de846492a75..cf4f928837773 100644
 | ||||
| --- a/ext/snmp/tests/snmp-object-setSecurity_error.phpt
 | ||||
| +++ b/ext/snmp/tests/snmp-object-setSecurity_error.phpt
 | ||||
| @@ -59,7 +59,7 @@ var_dump($session->close());
 | ||||
|  --EXPECTF-- | ||||
|  Security level must be one of "noAuthNoPriv", "authNoPriv", or "authPriv" | ||||
|  Security level must be one of "noAuthNoPriv", "authNoPriv", or "authPriv" | ||||
| -Authentication protocol must be either "MD5" or "SHA"
 | ||||
| +Authentication protocol must be %s
 | ||||
|   | ||||
|  Warning: SNMP::setSecurity(): Error generating a key for authentication pass phrase '': Generic error (The supplied password length is too short.) in %s on line %d | ||||
|  bool(false) | ||||
| diff --git a/ext/snmp/tests/snmp3-error.phpt b/ext/snmp/tests/snmp3-error.phpt
 | ||||
| index 849e363b45058..389800dad6b28 100644
 | ||||
| --- a/ext/snmp/tests/snmp3-error.phpt
 | ||||
| +++ b/ext/snmp/tests/snmp3-error.phpt
 | ||||
| @@ -58,7 +58,7 @@ try {
 | ||||
|  Checking error handling | ||||
|  Security level must be one of "noAuthNoPriv", "authNoPriv", or "authPriv" | ||||
|  Security level must be one of "noAuthNoPriv", "authNoPriv", or "authPriv" | ||||
| -Authentication protocol must be either "MD5" or "SHA"
 | ||||
| +Authentication protocol must be %s
 | ||||
|   | ||||
|  Warning: snmp3_get(): Error generating a key for authentication pass phrase '': Generic error (The supplied password length is too short.) in %s on line %d | ||||
|  bool(false) | ||||
							
								
								
									
										718
									
								
								php-8.0.10-systzdata-v21.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										718
									
								
								php-8.0.10-systzdata-v21.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,718 @@ | ||||
| # 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: | ||||
| r21: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi | ||||
| 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 20e4164aaa..a61243646d 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="-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/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 e9bd0f136d..c04ff01adc 100644
 | ||||
| --- a/ext/date/lib/parse_tz.c
 | ||||
| +++ b/ext/date/lib/parse_tz.c
 | ||||
| @@ -26,8 +26,21 @@
 | ||||
|  #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"
 | ||||
| +
 | ||||
| +#else
 | ||||
|  #define TIMELIB_SUPPORTS_V2DATA | ||||
|  #include "timezonedb.h" | ||||
| +#endif
 | ||||
| +
 | ||||
| +#include <ctype.h>
 | ||||
|   | ||||
|  #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) | ||||
|  # if defined(__LITTLE_ENDIAN__) | ||||
| @@ -94,6 +107,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; | ||||
| @@ -435,7 +453,467 @@ 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);
 | ||||
| +
 | ||||
| +	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 + 7);
 | ||||
| +
 | ||||
| +        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) {
 | ||||
| +		return NULL;
 | ||||
| +	} 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; | ||||
|   | ||||
| @@ -461,9 +939,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.system";
 | ||||
| +		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) | ||||
| @@ -475,7 +993,30 @@ 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 (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) | ||||
| @@ -517,6 +1058,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; | ||||
| @@ -524,7 +1067,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); | ||||
| @@ -563,11 +1106,36 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t
 | ||||
|  		} | ||||
|  		skip_posix_string(&tzf, tmp); | ||||
|   | ||||
| +#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. */
 | ||||
| +			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 2d5cffb963..389f09f313 100644
 | ||||
| --- a/ext/date/php_date.c
 | ||||
| +++ b/ext/date/php_date.c
 | ||||
| @@ -457,7 +457,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(); | ||||
|   | ||||
							
								
								
									
										45
									
								
								php-8.0.13-crypt.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								php-8.0.13-crypt.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,45 @@ | ||||
| From fc4e31467c352032ee709ac55d3c67bc22abcd8d Mon Sep 17 00:00:00 2001 | ||||
| From: Remi Collet <remi@remirepo.net> | ||||
| Date: Fri, 15 Oct 2021 17:11:12 +0200 | ||||
| Subject: [PATCH] add --with-external-libcrypt build option display an error | ||||
|  message if some algo not available in external libcrypt | ||||
| 
 | ||||
| ---
 | ||||
|  ext/standard/config.m4 | 21 ++++++++++++++++----- | ||||
|  1 file changed, 16 insertions(+), 5 deletions(-) | ||||
| 
 | ||||
| diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
 | ||||
| index 58b9c5e658a4..3ec18be4d7df 100644
 | ||||
| --- a/ext/standard/config.m4
 | ||||
| +++ b/ext/standard/config.m4
 | ||||
| @@ -267,14 +267,25 @@ int main() {
 | ||||
|  ])]) | ||||
|   | ||||
|   | ||||
| +PHP_ARG_WITH([external-libcrypt],
 | ||||
| +  [for external libcrypt or libxcrypt],
 | ||||
| +  [AS_HELP_STRING([--with-external-libcrypt],
 | ||||
| +    [Use external libcrypt or libxcrypt])],
 | ||||
| +  [no],
 | ||||
| +  [no])
 | ||||
| +
 | ||||
|  dnl | ||||
|  dnl If one of them is missing, use our own implementation, portable code is then possible | ||||
|  dnl | ||||
| -dnl TODO This is currently always enabled
 | ||||
| -if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes" || true; then
 | ||||
| -  AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5])
 | ||||
| -
 | ||||
| -  PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c)
 | ||||
| +dnl This is currently enabled by default
 | ||||
| +if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes" || test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
 | ||||
| +  if test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
 | ||||
| +    AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5])
 | ||||
| +
 | ||||
| +    PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c)
 | ||||
| +   else
 | ||||
| +    AC_MSG_ERROR([Cannot use external libcrypt as some algo are missing])
 | ||||
| +   fi
 | ||||
|  else | ||||
|    AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des]) | ||||
|  fi | ||||
							
								
								
									
										16
									
								
								php-8.0.19-parser.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								php-8.0.19-parser.patch
									
									
									
									
									
										Normal file
									
								
							| @ -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
 | ||||
| @@ -1075,6 +1075,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.13.0"; | ||||
|      $phpParserDir = __DIR__ . "/PHP-Parser-$version"; | ||||
|      if (!is_dir($phpParserDir)) { | ||||
							
								
								
									
										17
									
								
								php-8.0.20.tar.xz.asc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								php-8.0.20.tar.xz.asc
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,17 @@ | ||||
| -----BEGIN PGP SIGNATURE----- | ||||
| 
 | ||||
| iQJEBAABCgAuFiEEFyn4OTjaROJ7oPTT29s5dHDRIXIFAmKf85UQHHBvbGxpdGFA | ||||
| cGhwLm5ldAAKCRDb2zl0cNEhck+gEAC/LtjNXwNKHtE3M/mj8cYKIq3nJ1eOI7lD | ||||
| 9NBz+hUdMpH1RjtYqrEjflVWyLLRlqfa3ZtX9mlVEq1Z/+bUKR9a0OYyXOD1ZKYe | ||||
| nt6m2exrt4ZgynTDiwZrpcoT+yM5qhKx8OhiiLSOREI7M3Zrf5tmxuCnrDTwWq4n | ||||
| 6KlbeGg4KMq1HsAir8BVXTMV5C9BSChkBFgZtc6I1Mw4WfeBByrxILEPi9EFj2jy | ||||
| SSZBTUI/0sHKC1DAan1Ixdj5RAHWdpks8wAX5padQDDK+tytQLe92jQh1hD4scGE | ||||
| PGwPKaJ9I4UyBleuGV2oAFIXANwwWs54zqjW9QezbXJFU5PLNNyViOGfeNRv75uN | ||||
| jMOoi34/1egYpNM5OSHlLJi8Th1otvWmLqP/cSwRHFAjj9kp4g0kmKLNpOTxg/oo | ||||
| DtpX70FxlQhhJEpjKbJ0GIJbjZuvVkMBx6j4VyjL/GP67o/eCWinyiKGpI8uU3mL | ||||
| ihItvHydGoBgp3COYG3yVClHjWrJMsF4rABYn2VIbuF5nUQcPOc3v9ZlDvlIphQq | ||||
| e+TOGGDPkkZpfk1Jc6uBo5gpfA6ubF7+OwLfcoXb/jB6MhZOjgR1gb0Li+9GhMS0 | ||||
| s0o/jqk6ExhgzZ12KM7GqbW52tcEQA3eZEYbqTv3/WnurI9ijdzAmr/snXm8yZtS | ||||
| m3t0XapP2Q== | ||||
| =O/Ui | ||||
| -----END PGP SIGNATURE----- | ||||
							
								
								
									
										4761
									
								
								php-8.0.21-openssl3.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4761
									
								
								php-8.0.21-openssl3.patch
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										400
									
								
								php-8.0.6-deprecated.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										400
									
								
								php-8.0.6-deprecated.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,400 @@ | ||||
| From 4dc8b3c0efaae25b08c8f59b068f17c97c59d0ae Mon Sep 17 00:00:00 2001 | ||||
| From: Remi Collet <remi@remirepo.net> | ||||
| Date: Wed, 5 May 2021 15:41:00 +0200 | ||||
| Subject: [PATCH] get rid of inet_aton and inet_ntoa use inet_ntop iand | ||||
|  inet_pton where available standardize buffer size | ||||
| 
 | ||||
| ---
 | ||||
|  ext/sockets/sockaddr_conv.c |  4 ++++ | ||||
|  ext/sockets/sockets.c       | 48 +++++++++++++++++++++++++------------ | ||||
|  ext/standard/dns.c          | 16 ++++++++++++- | ||||
|  main/network.c              | 20 ++++++++++++++-- | ||||
|  4 files changed, 70 insertions(+), 18 deletions(-) | ||||
| 
 | ||||
| diff --git a/ext/sockets/sockaddr_conv.c b/ext/sockets/sockaddr_conv.c
 | ||||
| index 57996612d2d7e..65c8418fb3a6f 100644
 | ||||
| --- a/ext/sockets/sockaddr_conv.c
 | ||||
| +++ b/ext/sockets/sockaddr_conv.c
 | ||||
| @@ -87,7 +87,11 @@ int php_set_inet_addr(struct sockaddr_in *sin, char *string, php_socket *php_soc
 | ||||
|  	struct in_addr tmp; | ||||
|  	struct hostent *host_entry; | ||||
|   | ||||
| +#ifdef HAVE_INET_PTON
 | ||||
| +	if (inet_pton(AF_INET, string, &tmp)) {
 | ||||
| +#else
 | ||||
|  	if (inet_aton(string, &tmp)) { | ||||
| +#endif
 | ||||
|  		sin->sin_addr.s_addr = tmp.s_addr; | ||||
|  	} else { | ||||
|  		if (strlen(string) > MAXFQDNLEN || ! (host_entry = php_network_gethostbyname(string))) { | ||||
| diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
 | ||||
| index 16ad3e8013a4c..85c938d1b97b1 100644
 | ||||
| --- a/ext/sockets/sockets.c
 | ||||
| +++ b/ext/sockets/sockets.c
 | ||||
| @@ -220,8 +220,10 @@ zend_module_entry sockets_module_entry = {
 | ||||
|  ZEND_GET_MODULE(sockets) | ||||
|  #endif | ||||
|   | ||||
| +#ifndef HAVE_INET_NTOP
 | ||||
|  /* inet_ntop should be used instead of inet_ntoa */ | ||||
|  int inet_ntoa_lock = 0; | ||||
| +#endif
 | ||||
|   | ||||
|  static int php_open_listen_sock(php_socket *sock, int port, int backlog) /* {{{ */ | ||||
|  { | ||||
| @@ -1082,10 +1084,12 @@ PHP_FUNCTION(socket_getsockname)
 | ||||
|  	struct sockaddr_in		*sin; | ||||
|  #if HAVE_IPV6 | ||||
|  	struct sockaddr_in6		*sin6; | ||||
| -	char					addr6[INET6_ADDRSTRLEN+1];
 | ||||
| +#endif
 | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +	char					addrbuf[INET6_ADDRSTRLEN];
 | ||||
|  #endif | ||||
|  	struct sockaddr_un		*s_un; | ||||
| -	char					*addr_string;
 | ||||
| +	const char				*addr_string;
 | ||||
|  	socklen_t				salen = sizeof(php_sockaddr_storage); | ||||
|   | ||||
|  	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz|z", &arg1, socket_ce, &addr, &port) == FAILURE) { | ||||
| @@ -1106,8 +1110,8 @@ PHP_FUNCTION(socket_getsockname)
 | ||||
|  #if HAVE_IPV6 | ||||
|  		case AF_INET6: | ||||
|  			sin6 = (struct sockaddr_in6 *) sa; | ||||
| -			inet_ntop(AF_INET6, &sin6->sin6_addr, addr6, INET6_ADDRSTRLEN);
 | ||||
| -			ZEND_TRY_ASSIGN_REF_STRING(addr, addr6);
 | ||||
| +			inet_ntop(AF_INET6, &sin6->sin6_addr,  addrbuf, sizeof(addrbuf));
 | ||||
| +			ZEND_TRY_ASSIGN_REF_STRING(addr, addrbuf);
 | ||||
|   | ||||
|  			if (port != NULL) { | ||||
|  				ZEND_TRY_ASSIGN_REF_LONG(port, htons(sin6->sin6_port)); | ||||
| @@ -1117,11 +1121,14 @@ PHP_FUNCTION(socket_getsockname)
 | ||||
|  #endif | ||||
|  		case AF_INET: | ||||
|  			sin = (struct sockaddr_in *) sa; | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +			addr_string = inet_ntop(AF_INET, &sin->sin_addr, addrbuf, sizeof(addrbuf));
 | ||||
| +#else
 | ||||
|  			while (inet_ntoa_lock == 1); | ||||
|  			inet_ntoa_lock = 1; | ||||
|  			addr_string = inet_ntoa(sin->sin_addr); | ||||
|  			inet_ntoa_lock = 0; | ||||
| -
 | ||||
| +#endif
 | ||||
|  			ZEND_TRY_ASSIGN_REF_STRING(addr, addr_string); | ||||
|   | ||||
|  			if (port != NULL) { | ||||
| @@ -1154,10 +1161,12 @@ PHP_FUNCTION(socket_getpeername)
 | ||||
|  	struct sockaddr_in		*sin; | ||||
|  #if HAVE_IPV6 | ||||
|  	struct sockaddr_in6		*sin6; | ||||
| -	char					addr6[INET6_ADDRSTRLEN+1];
 | ||||
| +#endif
 | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +	char					addrbuf[INET6_ADDRSTRLEN];
 | ||||
|  #endif | ||||
|  	struct sockaddr_un		*s_un; | ||||
| -	char					*addr_string;
 | ||||
| +	const char				*addr_string;
 | ||||
|  	socklen_t				salen = sizeof(php_sockaddr_storage); | ||||
|   | ||||
|  	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oz|z", &arg1, socket_ce, &arg2, &arg3) == FAILURE) { | ||||
| @@ -1178,9 +1187,9 @@ PHP_FUNCTION(socket_getpeername)
 | ||||
|  #if HAVE_IPV6 | ||||
|  		case AF_INET6: | ||||
|  			sin6 = (struct sockaddr_in6 *) sa; | ||||
| -			inet_ntop(AF_INET6, &sin6->sin6_addr, addr6, INET6_ADDRSTRLEN);
 | ||||
| +			inet_ntop(AF_INET6, &sin6->sin6_addr, addrbuf, sizeof(addrbuf));
 | ||||
|   | ||||
| -			ZEND_TRY_ASSIGN_REF_STRING(arg2, addr6);
 | ||||
| +			ZEND_TRY_ASSIGN_REF_STRING(arg2, addrbuf);
 | ||||
|   | ||||
|  			if (arg3 != NULL) { | ||||
|  				ZEND_TRY_ASSIGN_REF_LONG(arg3, htons(sin6->sin6_port)); | ||||
| @@ -1191,11 +1200,14 @@ PHP_FUNCTION(socket_getpeername)
 | ||||
|  #endif | ||||
|  		case AF_INET: | ||||
|  			sin = (struct sockaddr_in *) sa; | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +			addr_string = inet_ntop(AF_INET, &sin->sin_addr, addrbuf, sizeof(addrbuf));
 | ||||
| +#else
 | ||||
|  			while (inet_ntoa_lock == 1); | ||||
|  			inet_ntoa_lock = 1; | ||||
|  			addr_string = inet_ntoa(sin->sin_addr); | ||||
|  			inet_ntoa_lock = 0; | ||||
| -
 | ||||
| +#endif
 | ||||
|  			ZEND_TRY_ASSIGN_REF_STRING(arg2, addr_string); | ||||
|   | ||||
|  			if (arg3 != NULL) { | ||||
| @@ -1527,12 +1539,14 @@ PHP_FUNCTION(socket_recvfrom)
 | ||||
|  	struct sockaddr_in	sin; | ||||
|  #if HAVE_IPV6 | ||||
|  	struct sockaddr_in6	sin6; | ||||
| -	char				addr6[INET6_ADDRSTRLEN];
 | ||||
| +#endif
 | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +	char				addrbuf[INET6_ADDRSTRLEN];
 | ||||
|  #endif | ||||
|  	socklen_t			slen; | ||||
|  	int					retval; | ||||
|  	zend_long				arg3, arg4; | ||||
| -	char				*address;
 | ||||
| +	const char			*address;
 | ||||
|  	zend_string			*recv_buf; | ||||
|   | ||||
|  	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ozllz|z", &arg1, socket_ce, &arg2, &arg3, &arg4, &arg5, &arg6) == FAILURE) { | ||||
| @@ -1590,7 +1604,11 @@ PHP_FUNCTION(socket_recvfrom)
 | ||||
|  			ZSTR_LEN(recv_buf) = retval; | ||||
|  			ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; | ||||
|   | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +			address = inet_ntop(AF_INET, &sin.sin_addr, addrbuf, sizeof(addrbuf));
 | ||||
| +#else
 | ||||
|  			address = inet_ntoa(sin.sin_addr); | ||||
| +#endif
 | ||||
|   | ||||
|  			ZEND_TRY_ASSIGN_REF_NEW_STR(arg2, recv_buf); | ||||
|  			ZEND_TRY_ASSIGN_REF_STRING(arg5, address ? address : "0.0.0.0"); | ||||
| @@ -1617,11 +1635,11 @@ PHP_FUNCTION(socket_recvfrom)
 | ||||
|  			ZSTR_LEN(recv_buf) = retval; | ||||
|  			ZSTR_VAL(recv_buf)[ZSTR_LEN(recv_buf)] = '\0'; | ||||
|   | ||||
| -			memset(addr6, 0, INET6_ADDRSTRLEN);
 | ||||
| -			inet_ntop(AF_INET6, &sin6.sin6_addr, addr6, INET6_ADDRSTRLEN);
 | ||||
| +			memset(addrbuf, 0, INET6_ADDRSTRLEN);
 | ||||
| +			inet_ntop(AF_INET6, &sin6.sin6_addr,  addrbuf, sizeof(addrbuf));
 | ||||
|   | ||||
|  			ZEND_TRY_ASSIGN_REF_NEW_STR(arg2, recv_buf); | ||||
| -			ZEND_TRY_ASSIGN_REF_STRING(arg5, addr6[0] ? addr6 : "::");
 | ||||
| +			ZEND_TRY_ASSIGN_REF_STRING(arg5, addrbuf[0] ? addrbuf : "::");
 | ||||
|  			ZEND_TRY_ASSIGN_REF_LONG(arg6, ntohs(sin6.sin6_port)); | ||||
|  			break; | ||||
|  #endif | ||||
| diff --git a/ext/standard/dns.c b/ext/standard/dns.c
 | ||||
| index 41b98424edb60..6efdbbe894b46 100644
 | ||||
| --- a/ext/standard/dns.c
 | ||||
| +++ b/ext/standard/dns.c
 | ||||
| @@ -228,6 +228,9 @@ PHP_FUNCTION(gethostbynamel)
 | ||||
|  	struct hostent *hp; | ||||
|  	struct in_addr in; | ||||
|  	int i; | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +	char addr4[INET_ADDRSTRLEN];
 | ||||
| +#endif
 | ||||
|   | ||||
|  	ZEND_PARSE_PARAMETERS_START(1, 1) | ||||
|  		Z_PARAM_PATH(hostname, hostname_len) | ||||
| @@ -255,7 +258,11 @@ PHP_FUNCTION(gethostbynamel)
 | ||||
|  		} | ||||
|   | ||||
|  		in = *h_addr_entry; | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +		add_next_index_string(return_value, inet_ntop(AF_INET, &in, addr4, INET_ADDRSTRLEN));
 | ||||
| +#else
 | ||||
|  		add_next_index_string(return_value, inet_ntoa(in)); | ||||
| +#endif
 | ||||
|  	} | ||||
|  } | ||||
|  /* }}} */ | ||||
| @@ -266,7 +273,10 @@ static zend_string *php_gethostbyname(char *name)
 | ||||
|  	struct hostent *hp; | ||||
|  	struct in_addr *h_addr_0; /* Don't call this h_addr, it's a macro! */ | ||||
|  	struct in_addr in; | ||||
| -	char *address;
 | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +	char addr4[INET_ADDRSTRLEN];
 | ||||
| +#endif
 | ||||
| +	const char *address;
 | ||||
|   | ||||
|  	hp = php_network_gethostbyname(name); | ||||
|  	if (!hp) { | ||||
| @@ -281,7 +291,11 @@ static zend_string *php_gethostbyname(char *name)
 | ||||
|   | ||||
|  	memcpy(&in.s_addr, h_addr_0, sizeof(in.s_addr)); | ||||
|   | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +	address = inet_ntop(AF_INET, &in, addr4, INET_ADDRSTRLEN);
 | ||||
| +#else
 | ||||
|  	address = inet_ntoa(in); | ||||
| +#endif
 | ||||
|  	return zend_string_init(address, strlen(address), 0); | ||||
|  } | ||||
|  /* }}} */ | ||||
| diff --git a/main/network.c b/main/network.c
 | ||||
| index 2c504952b2dd1..7f2f714ec42df 100644
 | ||||
| --- a/main/network.c
 | ||||
| +++ b/main/network.c
 | ||||
| @@ -236,8 +236,12 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
 | ||||
|  	} while ((sai = sai->ai_next) != NULL); | ||||
|   | ||||
|  	freeaddrinfo(res); | ||||
| +#else
 | ||||
| +#ifdef HAVE_INET_PTON
 | ||||
| +	if (!inet_pton(AF_INET, host, &in)) {
 | ||||
|  #else | ||||
|  	if (!inet_aton(host, &in)) { | ||||
| +#endif
 | ||||
|  		if(strlen(host) > MAXFQDNLEN) { | ||||
|  			host_info = NULL; | ||||
|  			errno = E2BIG; | ||||
| @@ -555,7 +559,11 @@ PHPAPI int php_network_parse_network_address_with_port(const char *addr, zend_lo
 | ||||
|  		goto out; | ||||
|  	} | ||||
|  #endif | ||||
| +#ifdef HAVE_INET_PTON
 | ||||
| +	if (inet_pton(AF_INET, tmp, &in4->sin_addr) > 0) {
 | ||||
| +#else
 | ||||
|  	if (inet_aton(tmp, &in4->sin_addr) > 0) { | ||||
| +#endif
 | ||||
|  		in4->sin_port = htons(port); | ||||
|  		in4->sin_family = AF_INET; | ||||
|  		*sl = sizeof(struct sockaddr_in); | ||||
| @@ -617,15 +625,19 @@ PHPAPI void php_network_populate_name_from_sockaddr(
 | ||||
|  	} | ||||
|   | ||||
|  	if (textaddr) { | ||||
| -#if HAVE_IPV6 && HAVE_INET_NTOP
 | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
|  		char abuf[256]; | ||||
|  #endif | ||||
| -		char *buf = NULL;
 | ||||
| +		const char *buf = NULL;
 | ||||
|   | ||||
|  		switch (sa->sa_family) { | ||||
|  			case AF_INET: | ||||
|  				/* generally not thread safe, but it *is* thread safe under win32 */ | ||||
| +#ifdef HAVE_INET_NTOP
 | ||||
| +				buf = inet_ntop(AF_INET, &((struct sockaddr_in*)sa)->sin_addr, (char *)&abuf, sizeof(abuf));
 | ||||
| +#else
 | ||||
|  				buf = inet_ntoa(((struct sockaddr_in*)sa)->sin_addr); | ||||
| +#endif
 | ||||
|  				if (buf) { | ||||
|  					*textaddr = strpprintf(0, "%s:%d", | ||||
|  						buf, ntohs(((struct sockaddr_in*)sa)->sin_port)); | ||||
| @@ -862,7 +874,11 @@ php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short
 | ||||
|   | ||||
|  					in4->sin_family = sa->sa_family; | ||||
|  					in4->sin_port = htons(bindport); | ||||
| +#ifdef HAVE_INET_PTON
 | ||||
| +					if (!inet_pton(AF_INET, bindto, &in4->sin_addr)) {
 | ||||
| +#else
 | ||||
|  					if (!inet_aton(bindto, &in4->sin_addr)) { | ||||
| +#endif
 | ||||
|  						php_error_docref(NULL, E_WARNING, "Invalid IP Address: %s", bindto); | ||||
|  						goto skip_bind; | ||||
|  					} | ||||
| From e5b6f43ec7813392d83ea586b7902e0396a1f792 Mon Sep 17 00:00:00 2001 | ||||
| From: Remi Collet <remi@remirepo.net> | ||||
| Date: Thu, 6 May 2021 14:21:29 +0200 | ||||
| Subject: [PATCH] get rid of inet_addr usage | ||||
| 
 | ||||
| ---
 | ||||
|  main/fastcgi.c            | 4 ++++ | ||||
|  sapi/litespeed/lsapilib.c | 4 ++++ | ||||
|  2 files changed, 8 insertions(+) | ||||
| 
 | ||||
| diff --git a/main/fastcgi.c b/main/fastcgi.c
 | ||||
| index 071f69d3a7f0..c936d42405de 100644
 | ||||
| --- a/main/fastcgi.c
 | ||||
| +++ b/main/fastcgi.c
 | ||||
| @@ -688,8 +688,12 @@ int fcgi_listen(const char *path, int backlog)
 | ||||
|  		if (!*host || !strncmp(host, "*", sizeof("*")-1)) { | ||||
|  			sa.sa_inet.sin_addr.s_addr = htonl(INADDR_ANY); | ||||
|  		} else { | ||||
| +#ifdef HAVE_INET_PTON
 | ||||
| +			if (!inet_pton(AF_INET, host, &sa.sa_inet.sin_addr)) {
 | ||||
| +#else
 | ||||
|  			sa.sa_inet.sin_addr.s_addr = inet_addr(host); | ||||
|  			if (sa.sa_inet.sin_addr.s_addr == INADDR_NONE) { | ||||
| +#endif
 | ||||
|  				struct hostent *hep; | ||||
|   | ||||
|  				if(strlen(host) > MAXFQDNLEN) { | ||||
| diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c
 | ||||
| index a72b5dc1b988..305f3326a682 100644
 | ||||
| --- a/sapi/litespeed/lsapilib.c
 | ||||
| +++ b/sapi/litespeed/lsapilib.c
 | ||||
| @@ -2672,8 +2672,12 @@ int LSAPI_ParseSockAddr( const char * pBind, struct sockaddr * pAddr )
 | ||||
|              ((struct sockaddr_in *)pAddr)->sin_addr.s_addr = htonl( INADDR_LOOPBACK ); | ||||
|          else | ||||
|          { | ||||
| +#ifdef HAVE_INET_PTON
 | ||||
| +            if (!inet_pton(AF_INET, p, &((struct sockaddr_in *)pAddr)->sin_addr))
 | ||||
| +#else
 | ||||
|              ((struct sockaddr_in *)pAddr)->sin_addr.s_addr = inet_addr( p ); | ||||
|              if ( ((struct sockaddr_in *)pAddr)->sin_addr.s_addr == INADDR_BROADCAST) | ||||
| +#endif
 | ||||
|              { | ||||
|                  doAddrInfo = 1; | ||||
|              } | ||||
| From 99d67d121acd4c324738509679d23acaf759d065 Mon Sep 17 00:00:00 2001 | ||||
| From: Remi Collet <remi@remirepo.net> | ||||
| Date: Thu, 6 May 2021 16:35:48 +0200 | ||||
| Subject: [PATCH] use getnameinfo instead of gethostbyaddr | ||||
| 
 | ||||
| ---
 | ||||
|  ext/standard/dns.c | 34 ++++++++++++++++++++++------------ | ||||
|  1 file changed, 22 insertions(+), 12 deletions(-) | ||||
| 
 | ||||
| diff --git a/ext/standard/dns.c b/ext/standard/dns.c
 | ||||
| index edd9a4549f5c..540c777faaba 100644
 | ||||
| --- a/ext/standard/dns.c
 | ||||
| +++ b/ext/standard/dns.c
 | ||||
| @@ -169,20 +169,30 @@ PHP_FUNCTION(gethostbyaddr)
 | ||||
|  static zend_string *php_gethostbyaddr(char *ip) | ||||
|  { | ||||
|  #if HAVE_IPV6 && HAVE_INET_PTON | ||||
| -	struct in6_addr addr6;
 | ||||
| -#endif
 | ||||
| -	struct in_addr addr;
 | ||||
| -	struct hostent *hp;
 | ||||
| +	struct sockaddr_in sa4;
 | ||||
| +	struct sockaddr_in6 sa6;
 | ||||
| +	char out[NI_MAXHOST];
 | ||||
|   | ||||
| -#if HAVE_IPV6 && HAVE_INET_PTON
 | ||||
| -	if (inet_pton(AF_INET6, ip, &addr6)) {
 | ||||
| -		hp = gethostbyaddr((char *) &addr6, sizeof(addr6), AF_INET6);
 | ||||
| -	} else if (inet_pton(AF_INET, ip, &addr)) {
 | ||||
| -		hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
 | ||||
| -	} else {
 | ||||
| -		return NULL;
 | ||||
| +	if (inet_pton(AF_INET6, ip, &sa6.sin6_addr)) {
 | ||||
| +		sa6.sin6_family = AF_INET6;
 | ||||
| +
 | ||||
| +		if (getnameinfo((struct sockaddr *)&sa6, sizeof(sa6), out, sizeof(out), NULL, 0, NI_NAMEREQD) < 0) {
 | ||||
| +			return zend_string_init(ip, strlen(ip), 0);
 | ||||
| +		}
 | ||||
| +		return zend_string_init(out, strlen(out), 0);
 | ||||
| +	} else if (inet_pton(AF_INET, ip, &sa4.sin_addr)) {
 | ||||
| +		sa4.sin_family = AF_INET;
 | ||||
| +
 | ||||
| +		if (getnameinfo((struct sockaddr *)&sa4, sizeof(sa4), out, sizeof(out), NULL, 0, NI_NAMEREQD) < 0) {
 | ||||
| +			return zend_string_init(ip, strlen(ip), 0);
 | ||||
| +		}
 | ||||
| +		return zend_string_init(out, strlen(out), 0);
 | ||||
|  	} | ||||
| +	return NULL; /* not a valid IP */
 | ||||
|  #else | ||||
| +	struct in_addr addr;
 | ||||
| +	struct hostent *hp;
 | ||||
| +
 | ||||
|  	addr.s_addr = inet_addr(ip); | ||||
|   | ||||
|  	if (addr.s_addr == -1) { | ||||
| @@ -190,13 +200,13 @@ static zend_string *php_gethostbyaddr(char *ip)
 | ||||
|  	} | ||||
|   | ||||
|  	hp = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET); | ||||
| -#endif
 | ||||
|   | ||||
|  	if (!hp || hp->h_name == NULL || hp->h_name[0] == '\0') { | ||||
|  		return zend_string_init(ip, strlen(ip), 0); | ||||
|  	} | ||||
|   | ||||
|  	return zend_string_init(hp->h_name, strlen(hp->h_name), 0); | ||||
| +#endif
 | ||||
|  } | ||||
|  /* }}} */ | ||||
|   | ||||
							
								
								
									
										438
									
								
								php-fpm-www.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										438
									
								
								php-fpm-www.conf
									
									
									
									
									
										Normal file
									
								
							| @ -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 | ||||
							
								
								
									
										137
									
								
								php-fpm.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										137
									
								
								php-fpm.conf
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,137 @@ | ||||
| ;;;;;;;;;;;;;;;;;;;;; | ||||
| ; FPM Configuration ; | ||||
| ;;;;;;;;;;;;;;;;;;;;; | ||||
| 
 | ||||
| ; All relative paths in this configuration file are relative to PHP's install | ||||
| ; prefix. | ||||
| 
 | ||||
| ; Include one or more files. If glob(3) exists, it is used to include a bunch of | ||||
| ; files from a glob(3) pattern. This directive can be used everywhere in the | ||||
| ; file. | ||||
| include=/etc/php-fpm.d/*.conf | ||||
| 
 | ||||
| ;;;;;;;;;;;;;;;;;; | ||||
| ; Global Options ; | ||||
| ;;;;;;;;;;;;;;;;;; | ||||
| 
 | ||||
| [global] | ||||
| ; Pid file | ||||
| ; Default Value: none | ||||
| pid = /run/php-fpm/php-fpm.pid | ||||
| 
 | ||||
| ; Error log file | ||||
| ; If it's set to "syslog", log is sent to syslogd instead of being written | ||||
| ; in a local file. | ||||
| ; Default Value: /var/log/php-fpm.log | ||||
| error_log = /var/log/php-fpm/error.log | ||||
| 
 | ||||
| ; syslog_facility is used to specify what type of program is logging the | ||||
| ; message. This lets syslogd specify that messages from different facilities | ||||
| ; will be handled differently. | ||||
| ; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON) | ||||
| ; Default Value: daemon | ||||
| ;syslog.facility = daemon | ||||
| 
 | ||||
| ; syslog_ident is prepended to every message. If you have multiple FPM | ||||
| ; instances running on the same server, you can change the default value | ||||
| ; which must suit common needs. | ||||
| ; Default Value: php-fpm | ||||
| ;syslog.ident = php-fpm | ||||
| 
 | ||||
| ; Log level | ||||
| ; Possible Values: alert, error, warning, notice, debug | ||||
| ; Default Value: notice | ||||
| ;log_level = notice | ||||
| 
 | ||||
| ; Log limit on number of characters in the single line (log entry). If the | ||||
| ; line is over the limit, it is wrapped on multiple lines. The limit is for | ||||
| ; all logged characters including message prefix and suffix if present. However | ||||
| ; the new line character does not count into it as it is present only when | ||||
| ; logging to a file descriptor. It means the new line character is not present | ||||
| ; when logging to syslog. | ||||
| ; Default Value: 1024 | ||||
| ;log_limit = 4096 | ||||
| 
 | ||||
| ; Log buffering specifies if the log line is buffered which means that the | ||||
| ; line is written in a single write operation. If the value is false, then the | ||||
| ; data is written directly into the file descriptor. It is an experimental | ||||
| ; option that can potentionaly improve logging performance and memory usage | ||||
| ; for some heavy logging scenarios. This option is ignored if logging to syslog | ||||
| ; as it has to be always buffered. | ||||
| ; Default value: yes | ||||
| ;log_buffering = no | ||||
| 
 | ||||
| ; If this number of child processes exit with SIGSEGV or SIGBUS within the time | ||||
| ; interval set by emergency_restart_interval then FPM will restart. A value | ||||
| ; of '0' means 'Off'. | ||||
| ; Default Value: 0 | ||||
| ;emergency_restart_threshold = 0 | ||||
| 
 | ||||
| ; Interval of time used by emergency_restart_interval to determine when | ||||
| ; a graceful restart will be initiated.  This can be useful to work around | ||||
| ; accidental corruptions in an accelerator's shared memory. | ||||
| ; Available Units: s(econds), m(inutes), h(ours), or d(ays) | ||||
| ; Default Unit: seconds | ||||
| ; Default Value: 0 | ||||
| ;emergency_restart_interval = 0 | ||||
| 
 | ||||
| ; Time limit for child processes to wait for a reaction on signals from master. | ||||
| ; Available units: s(econds), m(inutes), h(ours), or d(ays) | ||||
| ; Default Unit: seconds | ||||
| ; Default Value: 0 | ||||
| ;process_control_timeout = 0 | ||||
| 
 | ||||
| ; The maximum number of processes FPM will fork. This has been designed to control | ||||
| ; the global number of processes when using dynamic PM within a lot of pools. | ||||
| ; Use it with caution. | ||||
| ; Note: A value of 0 indicates no limit | ||||
| ; Default Value: 0 | ||||
| ;process.max = 128 | ||||
| 
 | ||||
| ; Specify the nice(2) priority to apply to the master process (only if set) | ||||
| ; The value can vary from -19 (highest priority) to 20 (lowest priority) | ||||
| ; Note: - It will only work if the FPM master process is launched as root | ||||
| ;       - The pool process will inherit the master process priority | ||||
| ;         unless specified otherwise | ||||
| ; Default Value: no set | ||||
| ;process.priority = -19 | ||||
| 
 | ||||
| ; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. | ||||
| ; Default Value: yes | ||||
| daemonize = yes | ||||
| 
 | ||||
| ; Set open file descriptor rlimit for the master process. | ||||
| ; Default Value: system defined value | ||||
| ;rlimit_files = 1024 | ||||
| 
 | ||||
| ; Set max core size rlimit for the master process. | ||||
| ; Possible Values: 'unlimited' or an integer greater or equal to 0 | ||||
| ; Default Value: system defined value | ||||
| ;rlimit_core = 0 | ||||
| 
 | ||||
| ; Specify the event mechanism FPM will use. The following is available: | ||||
| ; - select     (any POSIX os) | ||||
| ; - poll       (any POSIX os) | ||||
| ; - epoll      (linux >= 2.5.44) | ||||
| ; Default Value: not set (auto detection) | ||||
| ;events.mechanism = epoll | ||||
| 
 | ||||
| ; When FPM is built with systemd integration, specify the interval, | ||||
| ; in seconds, between health report notification to systemd. | ||||
| ; Set to 0 to disable. | ||||
| ; Available Units: s(econds), m(inutes), h(ours) | ||||
| ; Default Unit: seconds | ||||
| ; Default value: 10 | ||||
| ;systemd_interval = 10 | ||||
| 
 | ||||
| ;;;;;;;;;;;;;;;;;;;; | ||||
| ; Pool Definitions ; | ||||
| ;;;;;;;;;;;;;;;;;;;; | ||||
| 
 | ||||
| ; Multiple pools of child processes may be started with different listening | ||||
| ; ports and different management options.  The name of the pool will be | ||||
| ; used in logs and stats. There is no limitation on the number of pools which | ||||
| ; FPM can handle. Your system will tell you anyway :) | ||||
| 
 | ||||
| ; See /etc/php-fpm.d/*.conf | ||||
| 
 | ||||
							
								
								
									
										9
									
								
								php-fpm.logrotate
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								php-fpm.logrotate
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,9 @@ | ||||
| /var/log/php-fpm/*log { | ||||
|     missingok | ||||
|     notifempty | ||||
|     sharedscripts | ||||
|     delaycompress | ||||
|     postrotate | ||||
| 	/bin/kill -SIGUSR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/dev/null || true | ||||
|     endscript | ||||
| } | ||||
							
								
								
									
										19
									
								
								php-fpm.service
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								php-fpm.service
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,19 @@ | ||||
| # It's not recommended to modify this file in-place, because it | ||||
| # will be overwritten during upgrades.  If you want to customize, | ||||
| # the best way is to use the "systemctl edit" command. | ||||
| 
 | ||||
| [Unit] | ||||
| Description=The PHP FastCGI Process Manager | ||||
| After=syslog.target network.target | ||||
| 
 | ||||
| [Service] | ||||
| Type=notify | ||||
| ExecStart=/usr/sbin/php-fpm --nodaemonize | ||||
| ExecReload=/bin/kill -USR2 $MAINPID | ||||
| PrivateTmp=true | ||||
| RuntimeDirectory=php-fpm | ||||
| RuntimeDirectoryMode=0755 | ||||
| 
 | ||||
| [Install] | ||||
| WantedBy=multi-user.target | ||||
| 
 | ||||
							
								
								
									
										3
									
								
								php-fpm.wants
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								php-fpm.wants
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,3 @@ | ||||
| [Unit] | ||||
| Wants=php-fpm.service | ||||
| 
 | ||||
							
								
								
									
										597
									
								
								php-keyring.gpg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										597
									
								
								php-keyring.gpg
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,597 @@ | ||||
| -----BEGIN PGP PUBLIC KEY BLOCK----- | ||||
| 
 | ||||
| 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 | ||||
| yalYwuj7Yip5XJGttg== | ||||
| =jLhZ | ||||
| -----END PGP PUBLIC KEY BLOCK----- | ||||
							
								
								
									
										62
									
								
								php.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										62
									
								
								php.conf
									
									
									
									
									
										Normal file
									
								
							| @ -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> | ||||
							
								
								
									
										13
									
								
								php.modconf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								php.modconf
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,13 @@ | ||||
| # | ||||
| # PHP is an HTML-embedded scripting language which attempts to make it | ||||
| # easy for developers to write dynamically generated webpages. | ||||
| # | ||||
| 
 | ||||
| # Cannot load both php5, php7 and php modules | ||||
| <IfModule !mod_php5.c> | ||||
|   <IfModule !mod_php7.c> | ||||
|     <IfModule prefork.c> | ||||
|       LoadModule php_module modules/libphp.so | ||||
|     </IfModule> | ||||
|   </IfModule> | ||||
| </IfModule> | ||||
							
								
								
									
										10
									
								
								rpminspect.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								rpminspect.yaml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,10 @@ | ||||
| --- | ||||
| inspections: | ||||
|     # tracked as #1988529 php disables LTO in RHEL 9 | ||||
|     lto: off | ||||
| 
 | ||||
| emptyrpm: | ||||
|     # metapackage | ||||
|     expected_empty: | ||||
|         - php | ||||
| 
 | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user