[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt branches/PHP_5_3/ext/oci
sixd Fri, 02 Oct 2009 04:19:48 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289080
Log:
Fix skipifs to accept Oracle 11.2
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_2.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303_4.phpt
U php/php-src/trunk/ext/oci8/tests/bind_char_1.phpt
U php/php-src/trunk/ext/oci8/tests/bind_char_2.phpt
U php/php-src/trunk/ext/oci8/tests/bind_char_3.phpt
U php/php-src/trunk/ext/oci8/tests/bind_char_4.phpt
U php/php-src/trunk/ext/oci8/tests/bug27303.phpt
U php/php-src/trunk/ext/oci8/tests/bug27303_2.phpt
U php/php-src/trunk/ext/oci8/tests/bug27303_4.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt 2009-10-02 02:12:40 UTC (rev 289079)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_1.phpt 2009-10-02 04:19:48 UTC (rev 289080)
@@ -5,9 +5,9 @@
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
$sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
if ($sv !== 1) {
- die ("skip expected output only valid when using Oracle 11g database");
+ die ("skip expected output only valid when using Oracle 11g+ database");
}
?>
--FILE--
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt 2009-10-02 02:12:40 UTC (rev 289079)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_2.phpt 2009-10-02 04:19:48 UTC (rev 289080)
@@ -5,9 +5,9 @@
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
$sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
if ($sv !== 1) {
- die ("skip expected output only valid when using Oracle 11g database");
+ die ("skip expected output only valid when using Oracle 11g+ database");
}
?>
--FILE--
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt 2009-10-02 02:12:40 UTC (rev 289079)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_3.phpt 2009-10-02 04:19:48 UTC (rev 289080)
@@ -5,9 +5,9 @@
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
$sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
if ($sv !== 1) {
- die ("skip expected output only valid when using Oracle 11g database");
+ die ("skip expected output only valid when using Oracle 11g+ database");
}
?>
--FILE--
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt 2009-10-02 02:12:40 UTC (rev 289079)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bind_char_4.phpt 2009-10-02 04:19:48 UTC (rev 289080)
@@ -5,9 +5,9 @@
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
$sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
if ($sv !== 1) {
- die ("skip expected output only valid when using Oracle 11g database");
+ die ("skip expected output only valid when using Oracle 11g+ database");
}
?>
--FILE--
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303.phpt 2009-10-02 02:12:40 UTC (rev 289079)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug27303.phpt 2009-10-02 04:19:48 UTC (rev 289080)
@@ -5,9 +5,9 @@
if (!extension_loaded('oci8')) die ("skip no oci8 extension");
require(dirname(__FILE__)."/connect.inc");
$sv = oci_server_version($c);
-$sv = preg_match('/11.1/', $sv, $matches);
+$sv = preg_match('/Release 1[12]\./', $sv, $matches);
if ($sv !== 1) {
- die ("skip expected output only valid when using Oracle 11g database");
+ die ("skip expected output only valid when using Oracle 11g+ database");
}
?>
--FILE--
Modified: php/php-src/
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/mcrypt/mcrypt.c branches/PHP_5_2/ext/mcrypt/tests/bug49738.phpt branches/PHP_5_3/NEWS branches/PHP_5_3/ext/mcrypt/mcrypt.c branc
srinatar Fri, 02 Oct 2009 00:13:53 + Revision: http://svn.php.net/viewvc?view=revision&revision=289076 Log: - Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes). Bug: http://bugs.php.net/49738 (Open) calling mcrypt after mcrypt_generic_deinit crashes Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/mcrypt/mcrypt.c A php/php-src/branches/PHP_5_2/ext/mcrypt/tests/bug49738.phpt U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/mcrypt/mcrypt.c A php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug49738.phpt U php/php-src/trunk/ext/mcrypt/mcrypt.c A php/php-src/trunk/ext/mcrypt/tests/bug49738.phpt Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-10-01 23:51:33 UTC (rev 289075) +++ php/php-src/branches/PHP_5_2/NEWS 2009-10-02 00:13:53 UTC (rev 289076) @@ -20,6 +20,8 @@ - Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrongly converted). (Moriyoshi) - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) +- Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes). + (Sriram Natarajan) 17 Sep 2009, PHP 5.2.11 - Fixed certificate validation inside php_openssl_apply_verification_policy. Modified: php/php-src/branches/PHP_5_2/ext/mcrypt/mcrypt.c === --- php/php-src/branches/PHP_5_2/ext/mcrypt/mcrypt.c2009-10-01 23:51:33 UTC (rev 289075) +++ php/php-src/branches/PHP_5_2/ext/mcrypt/mcrypt.c2009-10-02 00:13:53 UTC (rev 289076) @@ -613,6 +613,7 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not terminate encryption specifier"); RETURN_FALSE } + pm->init = 0; RETURN_TRUE } /* }}} */ Added: php/php-src/branches/PHP_5_2/ext/mcrypt/tests/bug49738.phpt === --- php/php-src/branches/PHP_5_2/ext/mcrypt/tests/bug49738.phpt (rev 0) +++ php/php-src/branches/PHP_5_2/ext/mcrypt/tests/bug49738.phpt 2009-10-02 00:13:53 UTC (rev 289076) @@ -0,0 +1,13 @@ +--TEST-- +Bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug49738.php on line 5 Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-10-01 23:51:33 UTC (rev 289075) +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-02 00:13:53 UTC (rev 289076) @@ -25,6 +25,8 @@ - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) - Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised). (Chris Jones) +- Fixed bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes). + (Sriram Natarajan) ?? ??? 2009, PHP 5.3.1RC? Modified: php/php-src/branches/PHP_5_3/ext/mcrypt/mcrypt.c === --- php/php-src/branches/PHP_5_3/ext/mcrypt/mcrypt.c2009-10-01 23:51:33 UTC (rev 289075) +++ php/php-src/branches/PHP_5_3/ext/mcrypt/mcrypt.c2009-10-02 00:13:53 UTC (rev 289076) @@ -780,6 +780,7 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not terminate encryption specifier"); RETURN_FALSE } + pm->init = 0; RETURN_TRUE } /* }}} */ Added: php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug49738.phpt === --- php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug49738.phpt (rev 0) +++ php/php-src/branches/PHP_5_3/ext/mcrypt/tests/bug49738.phpt 2009-10-02 00:13:53 UTC (rev 289076) @@ -0,0 +1,13 @@ +--TEST-- +Bug #49738 (calling mcrypt after mcrypt_generic_deinit crashes) +--SKIPIF-- + +--FILE-- + +--EXPECTF-- +Warning: mcrypt_generic(): Operation disallowed prior to mcrypt_generic_init(). in %sbug49738.php on line 5 Modified: php/php-src/trunk/ext/mcrypt/mcrypt.c === --- php/php-src/trunk/ext/mcrypt/mcrypt.c 2009-10-01 23:51:33 UTC (rev 289075) +++ php/php-src/trunk/ext/mcrypt/mcrypt.c 2009-10-02 00:13:53 UTC (rev 289076) @@ -693,6 +693,7 @@ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not terminate encryption specifier"); RETURN_FALSE } + pm->init = 0; RETURN_TRUE } /* }}} */ Added: php/php-src/trunk/ext/mcrypt/tests/bug49738.phpt === --- php/php-src/trunk/ext/mcrypt/tests/bug49738.phpt (rev 0) +++ php/php-src/trunk/ext/mcrypt/tests/bug49738.phpt2009-10-02
[PHP-CVS] svn: /php/php-src/branches/PHP_5_2/ NEWS
iliaaThu, 01 Oct 2009 23:21:36 + Revision: http://svn.php.net/viewvc?view=revision&revision=289074 Log: Fixed typo Changed paths: U php/php-src/branches/PHP_5_2/NEWS Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-10-01 20:28:45 UTC (rev 289073) +++ php/php-src/branches/PHP_5_2/NEWS 2009-10-01 23:21:36 UTC (rev 289074) @@ -17,7 +17,7 @@ fclose). (Ilia) - Fixed bug #49354 (mb_strcut() cuts wrong length when offset is in the middle of a multibyte character). (Moriyoshi) -- Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrondly converted). +- Fixed bug #49528 (UTF-16 strings prefixed by BOMs wrongly converted). (Moriyoshi) - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
I added this notice to replace the rather pointless one :) As we already explained the NEWS entries will be merged once 5.3.1 has been released. Cheers, On Thu, Oct 1, 2009 at 5:55 PM, Jani Taskinen wrote: > jani Thu, 01 Oct 2009 15:55:05 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=289053 > > Log: > pff, no idea what is merged where by who and when and wtf.. > > Changed paths: > U php/php-src/branches/PHP_5_3/NEWS > > Modified: php/php-src/branches/PHP_5_3/NEWS > === > --- php/php-src/branches/PHP_5_3/NEWS 2009-10-01 14:56:53 UTC (rev 289052) > +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-01 15:55:05 UTC (rev 289053) > @@ -1,4 +1,4 @@ > -PHP > NEWS > +PHP > NEWS > ||| > ?? ??? 20??, PHP 5.3.2 > - Added ReflectionMethod::setAccessible() for invoking non-public methods > @@ -23,10 +23,11 @@ > - Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted > after > fclose). (Ilia) > - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) > -- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is > raised). (Chris Jones) > +- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is > raised). > + (Chris Jones) > > > -?? ??? 2009, PHP 5.3.1RC? < WILL BE MERGED LATER > +?? ??? 2009, PHP 5.3.1RC? > - Upgraded bundled sqlite to version 3.6.18. (Ilia) > - Restored shebang line check to CGI sapi (not checked by scanner anymore). > (Jani) > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
jani Thu, 01 Oct 2009 15:55:05 + Revision: http://svn.php.net/viewvc?view=revision&revision=289053 Log: pff, no idea what is merged where by who and when and wtf.. Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-10-01 14:56:53 UTC (rev 289052) +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-01 15:55:05 UTC (rev 289053) @@ -1,4 +1,4 @@ -PHP NEWS +PHPNEWS ||| ?? ??? 20??, PHP 5.3.2 - Added ReflectionMethod::setAccessible() for invoking non-public methods @@ -23,10 +23,11 @@ - Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after fclose). (Ilia) - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) -- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised). (Chris Jones) +- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised). + (Chris Jones) -?? ??? 2009, PHP 5.3.1RC? < WILL BE MERGED LATER +?? ??? 2009, PHP 5.3.1RC? - Upgraded bundled sqlite to version 3.6.18. (Ilia) - Restored shebang line check to CGI sapi (not checked by scanner anymore). (Jani) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
I forgot to ask: why not merge the fix to PHP_5_2 branch? --Jani Christopher Jones wrote: sixd Thu, 01 Oct 2009 14:56:53 + Revision: http://svn.php.net/viewvc?view=revision&revision=289052 Log: Add PECL bug #16842 Bug: http://pecl.php.net/bugs/16842 (unknown) Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-10-01 14:41:53 UTC (rev 289051) +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-01 14:56:53 UTC (rev 289052) @@ -23,6 +23,7 @@ - Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after fclose). (Ilia) - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) +- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised). (Chris Jones) ?? ??? 2009, PHP 5.3.1RC? < WILL BE MERGED LATER -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ NEWS
sixd Thu, 01 Oct 2009 14:56:53 + Revision: http://svn.php.net/viewvc?view=revision&revision=289052 Log: Add PECL bug #16842 Bug: http://pecl.php.net/bugs/16842 (unknown) Changed paths: U php/php-src/branches/PHP_5_3/NEWS Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-10-01 14:41:53 UTC (rev 289051) +++ php/php-src/branches/PHP_5_3/NEWS 2009-10-01 14:56:53 UTC (rev 289052) @@ -23,6 +23,7 @@ - Fixed bug #49517 (cURL's CURLOPT_FILE prevents file from being deleted after fclose). (Ilia) - Fixed bug #48805 (IPv6 socket transport is not working). (Ilia) +- Fixed PECL bug #16842 (oci_error return false when NO_DATA_FOUND is raised). (Chris Jones) ?? ??? 2009, PHP 5.3.1RC? < WILL BE MERGED LATER -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/fileinfo/libmagic/readcdf.c trunk/ext/fileinfo/libmagic/readcdf.c
pajoye Thu, 01 Oct 2009 13:55:16 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289049
Log:
- fix #49732, fix crash when timestamp conversion fails
Bug: http://bugs.php.net/49732 (Open) PHP crashes when using finfo_file() to
get mime info with this file (included)
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/readcdf.c
U php/php-src/trunk/ext/fileinfo/libmagic/readcdf.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2009-10-01 10:55:19 UTC (rev 289048)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-10-01 13:55:16 UTC (rev 289049)
@@ -12,6 +12,9 @@
(Rasmus)
- Fixed a open_basedir bypass in posix_mkfifo() identified by Grzegorz
Stachowiak. (Rasmus)
+
+- Fixed bug #49732 (crashes when using fileinfo when timestamp conversion
+ fails). (Pierre)
- Fixed bug #49698 (Unexpected change in strnatcasecmp()). (Rasmus)
- Fixed bug #49647 (DOMUserData does not exist). (Rob)
- Fixed bug #49630 (imap_listscan function missing). (Felipe)
@@ -21,7 +24,8 @@
fclose). (Ilia)
- Fixed bug #48805 (IPv6 socket transport is not working). (Ilia)
-?? ??? 2009, PHP 5.3.1RC? <- WHY IS THIS HERE? Gonna be released after 5.3.1
or what??
+
+?? ??? 2009, PHP 5.3.1RC? < WILL BE MERGED LATER
- Upgraded bundled sqlite to version 3.6.18. (Ilia)
- Restored shebang line check to CGI sapi (not checked by scanner anymore).
(Jani)
Modified: php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/readcdf.c
===
--- php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/readcdf.c
2009-10-01 10:55:19 UTC (rev 289048)
+++ php/php-src/branches/PHP_5_3/ext/fileinfo/libmagic/readcdf.c
2009-10-01 13:55:16 UTC (rev 289049)
@@ -125,7 +125,10 @@
return -1;
} else {
char *c, *ec;
- cdf_timestamp_to_timespec(&ts, tp);
+
+ if (cdf_timestamp_to_timespec(&ts, tp)
== -1) {
+ return -1;
+ }
c = ctime(&ts.tv_sec);
if ((ec = strchr(c, '\n')) != NULL)
*ec = '\0';
Modified: php/php-src/trunk/ext/fileinfo/libmagic/readcdf.c
===
--- php/php-src/trunk/ext/fileinfo/libmagic/readcdf.c 2009-10-01 10:55:19 UTC
(rev 289048)
+++ php/php-src/trunk/ext/fileinfo/libmagic/readcdf.c 2009-10-01 13:55:16 UTC
(rev 289049)
@@ -123,7 +123,10 @@
return -1;
} else {
char *c, *ec;
- cdf_timestamp_to_timespec(&ts, tp);
+
+ if (cdf_timestamp_to_timespec(&ts, tp)
== -1) {
+ return -1;
+ }
c = ctime(&ts.tv_sec);
if ((ec = strchr(c, '\n')) != NULL)
*ec = '\0';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/oci8.c branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt trunk/ext/oci8/oci8.c trunk/ext/oci8/tests/pecl_bug16842.phpt
NEWS?
--Jani
On 10/01/2009 08:51 AM, Christopher Jones wrote:
sixd Thu, 01 Oct 2009 05:51:11 +
Revision: http://svn.php.net/viewvc?view=revision&revision=289039
Log:
PECL Bug #16842 (oci_error return false when NO_DATA_FOUND is raised)
Bug: http://pecl.php.net/bugs/16842 (unknown)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
A php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt
U php/php-src/trunk/ext/oci8/oci8.c
A php/php-src/trunk/ext/oci8/tests/pecl_bug16842.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/oci8.c
===
--- php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2009-10-01 05:08:47 UTC
(rev 289038)
+++ php/php-src/branches/PHP_5_3/ext/oci8/oci8.c2009-10-01 05:51:11 UTC
(rev 289039)
@@ -1529,6 +1529,12 @@
break;
case OCI_NO_DATA:
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"OCI_NO_DATA");
+ errcode = php_oci_fetch_errmsg(err_p,&errbuf TSRMLS_CC);
+ if (errbuf) {
+ efree(errbuf);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"OCI_NO_DATA: failed to fetch error message");
+ }
break;
case OCI_ERROR:
errcode = php_oci_fetch_errmsg(err_p,&errbuf TSRMLS_CC);
Added: php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt
2009-10-01 05:51:11 UTC (rev 289039)
@@ -0,0 +1,69 @@
+--TEST--
+PECL Bug #16842 (NO_DATA_FOUND exception is a warning)
+--SKIPIF--
+
+--INI--
+error_reporting = E_WARNING
+--FILE--
+
+===DONE===
+
+--EXPECTF--
+Test 1
+Raises NO_DATA_FOUND
+
+Warning: oci_execute(): OCI_NO_DATA in %s on line 11
+bool(false)
+array(4) {
+ [%u|b%"code"]=>
+ int(1403)
+ [%u|b%"message"]=>
+ %unicode|string%(45) "ORA-01403: %s
+ORA-06512: at line 1"
+ [%u|b%"offset"]=>
+ int(0)
+ [%u|b%"sqltext"]=>
+ %unicode|string%(31) "begin raise NO_DATA_FOUND; end;"
+}
+Test 2
+Raises ZERO_DIVIDE
+
+Warning: oci_execute(): ORA-01476: %s
+ORA-06512: at line 1 in %s on line 19
+bool(false)
+array(4) {
+ [%u|b%"code"]=>
+ int(1476)
+ [%u|b%"message"]=>
+ %unicode|string%(56) "ORA-01476: %s
+ORA-06512: at line 1"
+ [%u|b%"offset"]=>
+ int(0)
+ [%u|b%"sqltext"]=>
+ %unicode|string%(29) "begin raise ZERO_DIVIDE; end;"
+}
+===DONE===
Property changes on:
php/php-src/branches/PHP_5_3/ext/oci8/tests/pecl_bug16842.phpt
___
Added: svn:keywords
+ Id Rev Revision
Added: svn:eol-style
+ native
Modified: php/php-src/trunk/ext/oci8/oci8.c
===
--- php/php-src/trunk/ext/oci8/oci8.c 2009-10-01 05:08:47 UTC (rev 289038)
+++ php/php-src/trunk/ext/oci8/oci8.c 2009-10-01 05:51:11 UTC (rev 289039)
@@ -1371,6 +1371,12 @@
break;
case OCI_NO_DATA:
php_error_docref(NULL TSRMLS_CC, E_WARNING,
"OCI_NO_DATA");
+ errcode = php_oci_fetch_errmsg(err_p,&errbuf TSRMLS_CC);
+ if (errbuf) {
+ efree(errbuf);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"OCI_NO_DATA: failed to fetch error message");
+ }
break;
case OCI_ERROR:
errcode = php_oci_fetch_errmsg(err_p,&errbuf TSRMLS_CC);
Added: php/php-src/trunk/ext/oci8/tests/pecl_bug16842.phpt
===
--- php/php-src/trunk/ext/oci8/tests/pecl_bug16842.phpt
(rev 0)
+++ php/php-src/trunk/ext/oci8/tests/pecl_bug16842.phpt 2009-10-01 05:51:11 UTC
(rev 289039)
@@ -0,0 +1,69 @@
+--TEST--
+PECL Bug #16842 (NO_DATA_FOUND exception is a warning)
+--SKIPIF--
+
+--INI--
+error_reporting = E_WARNING
+--FILE--
+
+===DONE===
+
+--EXPECTF--
+Test 1
+Raises NO_DATA_FOUND
+
+Warning: oci_execute(): OCI_NO_DATA in %s on line 11
+bool(false)
+array(4) {
+ [%u|b%"code"]=>
+ int(1403)
+ [%u|b%"message"]=>
+ %unicode|string%(45) "ORA-01403: %s
+ORA-06512: at line 1"
+ [%u|b%"offset"]=>
+ int(0)
+ [%u|b%"sqltext"]=>
+ %unicode|string%(31) "begin raise NO_DATA_FOUND; end;"
+}
+Test 2
+Raises ZERO_DIVIDE
+
+Warning: oci_execute(): ORA-01476: %s
+ORA-06512: at line 1 in %s on line 19
+bool(false)
+array(4) {
+ [%u|b%"code"]=>
+ int(1476)
+ [%u|b%"message"]=>
+ %unicode|string%(56) "OR
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt
uw Thu, 01 Oct 2009 08:56:28 + Revision: http://svn.php.net/viewvc?view=revision&revision=289046 Log: Updating test because of http://news.php.net/php.cvs/60561 Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt === --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt 2009-10-01 08:26:46 UTC (rev 289045) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_get_client_stats.phpt 2009-10-01 08:56:28 UTC (rev 289046) @@ -1033,9 +1033,9 @@ [%u|b%"mem_malloc_ammount"]=> %unicode|string%(1) "0" [%u|b%"mem_calloc_count"]=> - %unicode|string%(1) "0" + %unicode|string%(%d) "%d" [%u|b%"mem_calloc_ammount"]=> - %unicode|string%(1) "0" + %unicode|string%(%d) "%d" [%u|b%"mem_realloc_count"]=> %unicode|string%(1) "0" [%u|b%"mem_realloc_ammount"]=> Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt === --- php/php-src/trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt 2009-10-01 08:26:46 UTC (rev 289045) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_get_client_stats.phpt 2009-10-01 08:56:28 UTC (rev 289046) @@ -1033,9 +1033,9 @@ [%u|b%"mem_malloc_ammount"]=> %unicode|string%(1) "0" [%u|b%"mem_calloc_count"]=> - %unicode|string%(1) "0" + %unicode|string%(%d) "%d" [%u|b%"mem_calloc_ammount"]=> - %unicode|string%(1) "0" + %unicode|string%(%d) "%d" [%u|b%"mem_realloc_count"]=> %unicode|string%(1) "0" [%u|b%"mem_realloc_ammount"]=> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
