updated pcre patch to fix opcache build

[packages/php.git] / php-ini.patch

diff --git a/php-ini.patch b/php-ini.patch
index 7d03c6e0aac17e99b6ec138d722d7567866f22d9..b7eb813cea4a4e61b8e391bcd6df3e23206e2a41 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
---- php-5.6.0beta1/php.ini~    2014-04-21 21:38:01.000000000 +0300
-+++ php-5.6.0beta1/php.ini     2014-04-21 21:51:47.379819417 +0300
+--- php-7.0.0beta2/php.ini~    2015-07-29 21:59:24.000000000 +0300
++++ php-7.0.0beta2/php.ini     2015-07-29 22:45:17.116355242 +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
@@ -111,14 +111,14 @@
  ;;;;;;;;;;;;;;;;
  ; File Uploads ;
  ;;;;;;;;;;;;;;;;
-@@ -884,49 +837,8 @@
+@@ -825,46 +825,8 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
 -; Windows Extensions
 -; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
+-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+)
+-; extension folders as well as the separate PECL DLL download (PHP 5+).
 -; Be sure to appropriately set the extension_dir directive.
 -;
 -;extension=php_bz2.dll
@@ -133,7 +133,6 @@
 -;extension=php_ldap.dll
 -;extension=php_mbstring.dll
 -;extension=php_exif.dll      ; Must be after mbstring as it depends on it
--;extension=php_mysql.dll
 -;extension=php_mysqli.dll
 -;extension=php_oci8_12c.dll  ; Use with Oracle Database 12c Instant Client
 -;extension=php_openssl.dll
@@ -144,7 +143,6 @@
 -;extension=php_pdo_pgsql.dll
 -;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
--;extension=php_pspell.dll
 -;extension=php_shmop.dll
 -
 -; The MIBS data available in the PHP distribution must be installed. 
@@ -154,12 +152,11 @@
 -;extension=php_soap.dll
 -;extension=php_sockets.dll
 -;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
-+; Ideally in PLD Linux you should install appropriate php-<extension> or
-+; php-pecl-<extension> package.
++; Ideally in PLD Linux you should install appropriate php7.0-<extension> or
++; php7.0-pecl-<extension> package.
  
  ;;;;;;;;;;;;;;;;;;;
  ; Module Settings ;
@@ -186,16 +183,6 @@
  
  [intl]
  ;intl.default_locale =
-@@ -1152,6 +1062,9 @@
- ; http://php.net/mysql.connect-timeout
- mysql.connect_timeout = 60
- 
-+; The name of the character set to use as the default character set.
-+;mysql.connect_charset=utf8
-+
- ; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
- ; SQL-Errors will be displayed.
- ; http://php.net/mysql.trace-mode
 @@ -1191,6 +1104,9 @@
  ; http://php.net/mysqli.default-socket
  mysqli.default_socket =
@@ -211,7 +198,7 @@
  [browscap]
  ; http://php.net/browscap
 -;browscap = extra/browscap.ini
-+browscap = /etc/php/browscap.ini
++;browscap = /usr/share/browscap/php_browscap.ini
  
  [Session]
  ; Handler used to store/retrieve data.