up to 7.4.0beta1

diff --git a/opcache.ini b/opcache.ini
index 9f414a03a90c836ce9d0fef8e902e5d4a4445924..a84b2b450fc0f434ea3f9f35df33121cf1cad332 100644 (file)
--- a/opcache.ini
+++ b/opcache.ini
@@ -97,6 +97,10 @@ zend_extension=opcache.so
 ; errors.
 ;opcache.mmap_base=
 
+; Facilitates multiple OPcache instances per user (for Windows only). All PHP
+; processes with the same cache ID and user share an OPcache instance.
+;opcache.cache_id=
+
 ; 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.

diff --git a/php-ini.patch b/php-ini.patch
index b094643347a3816a522e4f4da62d9e4ac02615ab..992bd781531d008aed0a0cfef127a6baba4b2bbd 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-src-PHP-7.4/php.ini~   2019-05-05 01:01:58.000000000 +0300
-+++ php-src-PHP-7.4/php.ini    2019-05-05 01:02:49.674577615 +0300
+--- php-7.4.0beta1/php.ini~    2019-08-01 12:11:42.000000000 +0300
++++ php-7.4.0beta1/php.ini     2019-08-01 13:04:23.234196613 +0300
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommending using the
  ; development version only in development environments as errors shown to
@@ -218,11 +218,10 @@
  
  ; (time to live) Sets the number of second while cached file will be used
  ; instead of original one.
-@@ -1666,147 +1666,7 @@
- 
+@@ -1674,150 +1674,6 @@
  [dba]
  ;dba.default_handler=
--
+ 
 -[opcache]
 -; Determines if Zend OPCache is enabled
 -;opcache.enable=1
@@ -320,6 +319,10 @@
 -; errors.
 -;opcache.mmap_base=
 -
+-; Facilitates multiple OPcache instances per user (for Windows only). All PHP
+-; processes with the same cache ID and user share an OPcache instance.
+-;opcache.cache_id=
+-
 -; 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.
@@ -363,7 +366,6 @@
 -; Absolute path used to store shared lockfiles (for *nix only).
 -;opcache.lockfile_path=/tmp
 -
-+;
  [curl]
  ; A default value for the CURLOPT_CAINFO option. This is required to be an
  ; absolute path.

diff --git a/php.spec b/php.spec
index bc3baa83582ea430061a6a1c3dd9edc4ca5c6378..35a05fda2adc87abe03af8e17594c452e17b4717 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -147,7 +147,7 @@
 %undefine      with_pdo_sqlite
 %endif
 
-%define                subver alpha3
+%define                subver beta1
 %define                rel     1
 %define                orgname php
 %define                ver_suffix 74
@@ -169,7 +169,7 @@ License:    PHP 3.01 and Zend and BSD
 Group:         Libraries
 #Source0:      https://php.net/distributions/%{orgname}-%{version}.tar.xz
 Source0:       https://downloads.php.net/~derick/php-%{version}%{subver}.tar.xz
-# Source0-md5: 4981b9441688a53ea78a0e14c60bb8cc
+# Source0-md5: fa3501cf158adce37359667383ddb672
 Source1:       opcache.ini
 Source2:       %{orgname}-mod_php.conf
 Source3:       %{orgname}-cgi-fcgi.ini