diff options
| author | Elan Ruusamäe | 2011-08-07 22:26:13 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 9eb543e272329fab18845ac49c54894468df3f52 (patch) | |
| tree | eed1d34a8db67b1f45bd156df2b5876f39484e75 /php-ini.patch | |
| parent | 02d2dcbb6cfd17ce679c1680099d98d111b7d950 (diff) | |
| download | php-9eb543e272329fab18845ac49c54894468df3f52.zip php-9eb543e272329fab18845ac49c54894468df3f52.tar.gz | |
- previous commit was update to 5.4.0alpha2
- up to 5.4.0alpha3
- --enable-magic-quotes removed
- php 5.4: The default_charset setting now defaults to UTF-8.
- BR: autoconf >= 2.59
- package more README files
Changed files:
php-ini.patch -> 1.42.4.1
php.spec -> 1.945.2.2
spl-shared.patch -> 1.6.4.1
Diffstat (limited to 'php-ini.patch')
| -rw-r--r-- | php-ini.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/php-ini.patch b/php-ini.patch index a0ed0e0..b503725 100644 --- a/php-ini.patch +++ b/php-ini.patch @@ -1,5 +1,5 @@ ---- php-5.3.4/php.ini~ 2010-12-12 23:03:42.000000000 +0200 -+++ php-5.3.4/php.ini 2010-12-12 23:05:56.583592856 +0200 +--- php-5.4.0alpha3/php.ini~ 2011-08-08 00:06:52.000000000 +0300 ++++ php-5.4.0alpha3/php.ini 2011-08-08 00:09:15.835275555 +0300 @@ -223,7 +223,7 @@ ; Development Value: Off ; Production Value: Off @@ -83,20 +83,7 @@ ;;;;;;;;;;;;;;;; ; File Uploads ; -@@ -876,11 +876,7 @@ - ; - ; extension=modulename.extension - ; --; For example, on Windows: --; --; extension=msql.dll --; --; ... or under UNIX: -+; For example under UNIX: - ; - ; extension=msql.so - ; -@@ -887,39 +887,8 @@ +@@ -795,52 +795,8 @@ ; If you only provide the name of the extension, PHP will look for it in its ; default extension directory. ; @@ -124,7 +111,6 @@ -;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client -;extension=php_openssl.dll -;extension=php_pdo_firebird.dll --;extension=php_pdo_mssql.dll -;extension=php_pdo_mysql.dll -;extension=php_pdo_oci.dll -;extension=php_pdo_odbc.dll @@ -133,11 +119,25 @@ -;extension=php_pgsql.dll -;extension=php_pspell.dll -;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll +; Ideally in PLD Linux you should install appropriate php-<extension> or +; php-pecl-<extension> package. - ; The MIBS data available in the PHP distribution must be installed. - ; See http://www.php.net/manual/en/snmp.installation.php + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; @@ -1235,6 +1140,9 @@ ; http://php.net/mysql.connect-timeout mysql.connect_timeout = 60 |