From 752015395fc8b95cc4a86b68189cb747fe9a8499 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 1 May 2012 00:01:20 +0000
Subject: Tue May  1 00:01:20 UTC 2012

---
 testing/php/php.ini.patch | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'testing/php/php.ini.patch')

diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch
index 3dc5b6560..bbaae2152 100644
--- a/testing/php/php.ini.patch
+++ b/testing/php/php.ini.patch
@@ -1,6 +1,6 @@
---- php.ini-production	2011-12-15 11:31:02.000000000 +0100
-+++ php.ini-production	2012-01-11 10:43:02.069936043 +0100
-@@ -376,7 +376,7 @@
+--- php.ini-production	2012-03-29 06:17:59.000000000 +0200
++++ php.ini-production	2012-03-30 10:46:21.181340861 +0200
+@@ -305,7 +305,7 @@
  ; or per-virtualhost web server configuration file. This directive is
  ; *NOT* affected by whether Safe Mode is turned On or Off.
  ; http://php.net/open-basedir
@@ -9,7 +9,7 @@
  
  ; This directive allows you to disable certain functions for security reasons.
  ; It receives a comma-delimited list of function names. This directive is
-@@ -793,7 +793,7 @@
+@@ -702,7 +702,7 @@
  ;;;;;;;;;;;;;;;;;;;;;;;;;
  
  ; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
  ;
  ; Windows: "\path1;\path2"
  ;include_path = ".;c:\php\includes"
-@@ -816,7 +816,7 @@
+@@ -725,7 +725,7 @@
  
  ; Directory in which the loadable extensions (modules) reside.
  ; http://php.net/extension-dir
@@ -27,7 +27,7 @@
  ; On windows:
  ; extension_dir = "ext"
  
-@@ -950,53 +950,49 @@
+@@ -859,51 +859,47 @@
  ; If you only provide the name of the extension, PHP will look for it in its
  ; default extension directory.
  ;
@@ -55,7 +55,6 @@
 -;extension=php_oci8_11g.dll  ; Use with Oracle 11gR2 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
@@ -71,7 +70,6 @@
 -
 -;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
@@ -92,7 +90,6 @@
 +;extension=iconv.so
 +;extension=imap.so
 +;extension=intl.so
-+extension=json.so
 +;extension=ldap.so
 +;extension=mcrypt.so
 +;extension=mssql.so
@@ -113,7 +110,6 @@
 +;extension=soap.so
 +;extension=sockets.so
 +;extension=sqlite3.so
-+;extension=sqlite.so
 +;extension=sysvmsg.so
 +;extension=sysvsem.so
 +;extension=sysvshm.so
-- 
cgit v1.2.3-54-g00ecf