[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/password_new.phpt branches/PHP_5_3/ext/oci8/tests/password_old.phpt trunk/ext/oci8/tests/password_new.phpt trunk/ext/oci8/tests/password_ol

[Christopher Jones]

sixd Fri, 02 Oct 2009 22:39:28 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289113

Log:
Oracle 11.2 (and beyond) compat changes

Changed paths:
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/password_new.phpt
U   php/php-src/branches/PHP_5_3/ext/oci8/tests/password_old.phpt
U   php/php-src/trunk/ext/oci8/tests/password_new.phpt
U   php/php-src/trunk/ext/oci8/tests/password_old.phpt

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/password_new.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/password_new.phpt   
2009-10-02 22:36:01 UTC (rev 289112)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/password_new.phpt   
2009-10-02 22:39:28 UTC (rev 289113)
@@ -3,21 +3,21 @@
 --SKIPIF--
  10/', $phpinfo);
if ($iv === 1) {
-   die ("skip test known to fail using Oracle 10gR2 client libs 
connecting to Oracle 11.1 (6277160)");
+   die ("skip test known to fail using Oracle 10.2.0.4 client libs 
connecting to Oracle 11 (6277160)");
}
 }
 ?>

Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/password_old.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/password_old.phpt   
2009-10-02 22:36:01 UTC (rev 289112)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/password_old.phpt   
2009-10-02 22:39:28 UTC (rev 289113)
@@ -3,21 +3,21 @@
 --SKIPIF--
  10/', $phpinfo);
if ($iv === 1) {
-   die ("skip test known to fail using Oracle 10gR2 client libs 
connecting to Oracle 11.1 (6277160)");
+   die ("skip test known to fail using Oracle 10.2.0.4 client libs 
connecting to Oracle 11 (6277160)");
}
 }
 ?>

Modified: php/php-src/trunk/ext/oci8/tests/password_new.phpt
===
--- php/php-src/trunk/ext/oci8/tests/password_new.phpt  2009-10-02 22:36:01 UTC 
(rev 289112)
+++ php/php-src/trunk/ext/oci8/tests/password_new.phpt  2009-10-02 22:39:28 UTC 
(rev 289113)
@@ -3,21 +3,21 @@
 --SKIPIF--
  10/', $phpinfo);
if ($iv === 1) {
-   die ("skip test known to fail using Oracle 10gR2 client libs 
connecting to Oracle 11.1 (6277160)");
+   die ("skip test known to fail using Oracle 10.2.0.4 client libs 
connecting to Oracle 11 (6277160)");
}
 }
 ?>

Modified: php/php-src/trunk/ext/oci8/tests/password_old.phpt
===
--- php/php-src/trunk/ext/oci8/tests/password_old.phpt  2009-10-02 22:36:01 UTC 
(rev 289112)
+++ php/php-src/trunk/ext/oci8/tests/password_old.phpt  2009-10-02 22:39:28 UTC 
(rev 289113)
@@ -3,21 +3,21 @@
 --SKIPIF--
  10/', $phpinfo);
if ($iv === 1) {
-   die ("skip test known to fail using Oracle 10gR2 client libs 
connecting to Oracle 11.1 (6277160)");
+   die ("skip test known to fail using Oracle 10.2.0.4 client libs 
connecting to Oracle 11 (6277160)");
}
 }
 ?>

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/win-installer/trunk/ PHPInstallerCommon52.wxs

[John Mertic]

jmertic  Fri, 02 Oct 2009 16:11:30 +

Revision: http://svn.php.net/viewvc?view=revision&revision=289090

Log:
Fixed bug in 5.2 TS installer where you couldn't select the IIS FastCGI sapi 
very easily.

Changed paths:
U   php/win-installer/trunk/PHPInstallerCommon52.wxs

Modified: php/win-installer/trunk/PHPInstallerCommon52.wxs
===
--- php/win-installer/trunk/PHPInstallerCommon52.wxs2009-10-02 15:45:06 UTC 
(rev 289089)
+++ php/win-installer/trunk/PHPInstallerCommon52.wxs2009-10-02 16:11:30 UTC 
(rev 289090)
@@ -666,20 +666,19 @@
 
 
+  Value="iis4FastCGI" X="5" Y="60" Width="250" Height="15" />
 
+  Value="iis4CGI" X="5" Y="72" Width="250" Height="15" />
 
+  Value="nsapi" X="5" Y="84" Width="250" Height="15" />
 
+  Value="xitami" X="5" Y="96" Width="250" Height="15" />
 
+  Value="sambar" X="5" Y="108" Width="250" Height="15" />
 
+  Value="netserve" X="5" Y="120" Width="250" Height="15" />
 
-
+  Value="cgi" X="5" Y="132" Width="250" Height="15" />
 
   

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php