[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Fri Mar 13 01:32:47 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3342r2=1.3343diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3342 php-src/ChangeLog:1.3343 --- php-src/ChangeLog:1.3342Thu Mar 12 01:33:06 2009 +++ php-src/ChangeLog Fri Mar 13 01:32:45 2009 @@ -1,3 +1,58 @@ +2009-03-12 Christopher Jones christopher.jo...@oracle.com + +* (PHP_5_3) + NEWS: + Add PECL Bug #14268 + +* (PHP_5_3) + ext/oci8/config.m4: + MFH: Fixed PECL Bug 14268 (Allow 'pecl install oci8' command to + 'autodetect' an Instant Client RPM install) refactor + +* ext/oci8/config.m4: + Fixed PECL Bug 14268 (Allow 'pecl install oci8' command to 'autodetect' an + Instant Client RPM install) refactor + +2009-03-12 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + NEWS + ext/pgsql/pgsql.c: + + MFB: Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a + string + literal) + +* ext/pgsql/pgsql.c: + + Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a + string + literal) + +* (PHP_5_3) + ext/pgsql/pgsql.c: + Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a string + literal) + +2009-03-12 Zoe Slattery zoe.slatt...@googlemail.com + +* run-tests.php + run-tests.php + run-tests.php: + refixing %r in run-tests.php (thanks iain lewis for the fix) + +2009-03-12 Andrei Zmievski and...@gravitonic.com + +* ext/pdo/pdo_stmt.c: + Fix copy-pasto (needs to return proper CE). + +2009-03-12 Christopher Jones christopher.jo...@oracle.com + +* ext/oci8/tests/connect_without_oracle_home.phpt + ext/oci8/tests/connect_without_oracle_home_old.phpt + ext/oci8/tests/pecl_bug16035.phpt: + Fix tests to use ENV and re-enable + 2009-03-11 Brian Shire sh...@tekrat.com * (PHP_5_3) @@ -31998,7 +32053,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3342 2009/03/12 01:33:06 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3343 2009/03/13 01:32:45 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src /ext/oci8/tests connect_without_oracle_home.phpt connect_without_oracle_home_old.phpt pecl_bug16035.phpt
sixdThu Mar 12 14:47:47 2009 UTC
Modified files:
/php-src/ext/oci8/tests connect_without_oracle_home.phpt
connect_without_oracle_home_old.phpt
pecl_bug16035.phpt
Log:
Fix tests to use ENV and re-enable
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_without_oracle_home.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/oci8/tests/connect_without_oracle_home.phpt
diff -u php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.5
php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.6
--- php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.5 Mon Mar 9
18:59:20 2009
+++ php-src/ext/oci8/tests/connect_without_oracle_home.phpt Thu Mar 12
14:47:47 2009
@@ -3,8 +3,6 @@
--SKIPIF--
?php
if (!extension_loaded('oci8')) die(skip no oci8 extension);
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set
when PHP starts. Using putenv('ORACLE_HOME=') at runtime will still segfault
*/
-die(skip can't be tested with run-tests.php);
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
@@ -13,6 +11,8 @@
die (skip Test only valid when OCI8 is built with an ORACLE_HOME);
}
?
+--ENV--
+ORACLE_HOME=
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt
diff -u php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.5
php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.6
--- php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.5 Mon Mar
9 18:59:20 2009
+++ php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt Thu Mar 12
14:47:47 2009
@@ -3,8 +3,6 @@
--SKIPIF--
?php
if (!extension_loaded('oci8')) die(skip no oci8 extension);
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set
when PHP starts. Using putenv('ORACLE_HOME=') at runtime will still segfault
*/
-die(skip can't be tested with run-tests.php);
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
@@ -13,6 +11,8 @@
die (skip Test only valid when OCI8 is built with an ORACLE_HOME);
}
?
+--ENV--
+ORACLE_HOME=
--FILE--
?php
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/pecl_bug16035.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/oci8/tests/pecl_bug16035.phpt
diff -u php-src/ext/oci8/tests/pecl_bug16035.phpt:1.1
php-src/ext/oci8/tests/pecl_bug16035.phpt:1.2
--- php-src/ext/oci8/tests/pecl_bug16035.phpt:1.1 Mon Mar 9 18:59:20 2009
+++ php-src/ext/oci8/tests/pecl_bug16035.phpt Thu Mar 12 14:47:47 2009
@@ -3,8 +3,6 @@
--SKIPIF--
?php
if (!extension_loaded('oci8')) die (skip no oci8 extension);
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set
when PHP starts. Using putenv('ORACLE_HOME=') at runtime will still segfault
*/
-die(skip can't be tested with run-tests.php);
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
@@ -13,6 +11,8 @@
die (skip Test only valid when OCI8 is built with an ORACLE_HOME);
}
?
+--ENV--
+ORACLE_HOME=
--FILE--
?php
@@ -23,5 +23,5 @@
===DONE===
?php exit(0); ?
--EXPECTF--
-PHP Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something
wrong with your system - please check that ORACLE_HOME is set and points to the
right directory in %s on line %d
+Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong
with your system - please check that ORACLE_HOME is set and points to the right
directory in %s on line %d
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8/tests connect_without_oracle_home.phpt connect_without_oracle_home_old.phpt pecl_bug16035.phpt
sixdThu Mar 12 14:50:30 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8/tests connect_without_oracle_home.phpt
connect_without_oracle_home_old.phpt
pecl_bug16035.phpt
Log:
MFH: Fix tests to use ENV and re-enable
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_without_oracle_home.phpt?r1=1.1.2.2.2.1.2.1r2=1.1.2.2.2.1.2.2diff_format=u
Index: php-src/ext/oci8/tests/connect_without_oracle_home.phpt
diff -u php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.1.2.2.2.1.2.1
php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.1.2.2.2.1.2.2
--- php-src/ext/oci8/tests/connect_without_oracle_home.phpt:1.1.2.2.2.1.2.1
Mon Mar 9 19:01:16 2009
+++ php-src/ext/oci8/tests/connect_without_oracle_home.phpt Thu Mar 12
14:50:29 2009
@@ -3,8 +3,6 @@
--SKIPIF--
?php
if (!extension_loaded('oci8')) die(skip no oci8 extension);
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set
when PHP starts. Using putenv('ORACLE_HOME=') at runtime will still segfault
*/
-die(skip can't be tested with run-tests.php);
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
@@ -13,13 +11,13 @@
die (skip Test only valid when OCI8 is built with an ORACLE_HOME);
}
?
+--ENV--
+ORACLE_HOME=
--FILE--
?php
require dirname(__FILE__)./details.inc;
-putenv('ORACLE_HOME=');
-
if (!empty($dbase)) {
var_dump(oci_connect($user, $password, $dbase));
}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt?r1=1.1.2.2.2.1.2.1r2=1.1.2.2.2.1.2.2diff_format=u
Index: php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt
diff -u
php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.1.2.2.2.1.2.1
php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.1.2.2.2.1.2.2
--- php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt:1.1.2.2.2.1.2.1
Mon Mar 9 19:01:16 2009
+++ php-src/ext/oci8/tests/connect_without_oracle_home_old.phpt Thu Mar 12
14:50:29 2009
@@ -3,8 +3,6 @@
--SKIPIF--
?php
if (!extension_loaded('oci8')) die(skip no oci8 extension);
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set
when PHP starts. Using putenv('ORACLE_HOME=') at runtime will still segfault
*/
-die(skip can't be tested with run-tests.php);
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
@@ -13,13 +11,13 @@
die (skip Test only valid when OCI8 is built with an ORACLE_HOME);
}
?
+--ENV--
+ORACLE_HOME=
--FILE--
?php
require dirname(__FILE__)./details.inc;
-putenv('ORACLE_HOME=');
-
if (!empty($dbase)) {
var_dump(ocilogon($user, $password, $dbase));
}
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/tests/pecl_bug16035.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/oci8/tests/pecl_bug16035.phpt
diff -u php-src/ext/oci8/tests/pecl_bug16035.phpt:1.1.2.2
php-src/ext/oci8/tests/pecl_bug16035.phpt:1.1.2.3
--- php-src/ext/oci8/tests/pecl_bug16035.phpt:1.1.2.2 Mon Mar 9 19:01:16 2009
+++ php-src/ext/oci8/tests/pecl_bug16035.phpt Thu Mar 12 14:50:29 2009
@@ -3,8 +3,6 @@
--SKIPIF--
?php
if (!extension_loaded('oci8')) die (skip no oci8 extension);
-/* Disabled: Fix for PECL Bug #16035 stops a crash if ORACLE_HOME is not set
when PHP starts. Using putenv('ORACLE_HOME=') at runtime will still segfault
*/
-die(skip can't be tested with run-tests.php);
ob_start();
phpinfo(INFO_MODULES);
$phpinfo = ob_get_clean();
@@ -13,15 +11,16 @@
die (skip Test only valid when OCI8 is built with an ORACLE_HOME);
}
?
+--ENV--
+ORACLE_HOME=
--FILE--
?php
-putenv('ORACLE_HOME=');
oci_connect('abc', 'def', 'ghi', 'jkl');
?
===DONE===
?php exit(0); ?
--EXPECTF--
-PHP Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something
wrong with your system - please check that ORACLE_HOME is set and points to the
right directory in %s on line %d
+Warning: oci_connect(): OCIEnvNlsCreate() failed. There is something wrong
with your system - please check that ORACLE_HOME is set and points to the right
directory in %s on line %d
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
zoe Thu Mar 12 20:39:03 2009 UTC
Modified files:
/php-srcrun-tests.php
Log:
refixing %r in run-tests.php (thanks iain lewis for the fix)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.392r2=1.393diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.392 php-src/run-tests.php:1.393
--- php-src/run-tests.php:1.392 Tue Mar 10 23:39:10 2009
+++ php-src/run-tests.php Thu Mar 12 20:39:02 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.392 2009/03/10 23:39:10 helly Exp $ */
+/* $Id: run-tests.php,v 1.393 2009/03/12 20:39:02 zoe Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.392 $' . \n;
+ echo '$Revision: 1.393 $' . \n;
exit(1);
default:
@@ -1738,32 +1738,33 @@
if (isset($section_text['EXPECTF'])) {
-// do preg_quote, but miss out any %r delimited sections
-$temp = ;
-$r = %r;
-$startOffset = 0;
-$length = strlen($wanted_re);
-while($startOffset $length) {
- $start = strpos($wanted_re, $r, $startOffset);
- if ($start !== false) {
-// we have found a start tag
-$end = strpos($wanted_re, $r, $start+2);
-if ($end === false) {
- // unbalanced tag, ignore it.
- $end = $start = $length;
-}
- } else {
-// no more %r sections
-$start = $end = $length;
- }
- // quote a non re portion of the string
- $temp = $temp . preg_quote(substr($wanted_re, $startOffset,
($start - $startOffset)), '/');
- // add the re unquoted.
- $temp = $temp . substr($wanted_re, $start+2, ($end -
$start-2));
- $startOffset = $end + 2;
-}
-$wanted_re = $temp;
- $wanted_re = str_replace(
+ // do preg_quote, but miss out any %r delimited sections
+ $temp = ;
+ $r = %r;
+ $startOffset = 0;
+ $length = strlen($wanted_re);
+ while($startOffset $length) {
+ $start = strpos($wanted_re, $r, $startOffset);
+ if ($start !== false) {
+ // we have found a start tag
+ $end = strpos($wanted_re, $r, $start+2);
+ if ($end === false) {
+ // unbalanced tag, ignore it.
+ $end = $start = $length;
+ }
+ } else {
+ // no more %r sections
+ $start = $end = $length;
+ }
+ // quote a non re portion of the string
+ $temp = $temp . preg_quote(substr($wanted_re,
$startOffset, ($start - $startOffset)), '/');
+ // add the re unquoted.
+ $temp = $temp . '(' . substr($wanted_re, $start+2,
($end - $start-2)). ')';
+ $startOffset = $end + 2;
+ }
+ $wanted_re = $temp;
+
+ $wanted_re = str_replace(
array('%binary_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'binary string',
$wanted_re
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / run-tests.php
zoe Thu Mar 12 20:42:46 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
refixing %r in run-tests.php (thanks iain lewis for the fix)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.62r2=1.226.2.37.2.35.2.63diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.62
php-src/run-tests.php:1.226.2.37.2.35.2.63
--- php-src/run-tests.php:1.226.2.37.2.35.2.62 Tue Mar 3 10:53:44 2009
+++ php-src/run-tests.php Thu Mar 12 20:42:46 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.62 2009/03/03 10:53:44 zoe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.63 2009/03/12 20:42:46 zoe Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.62
$' . \n;
+ echo '$Revision: 1.226.2.37.2.35.2.63
$' . \n;
exit(1);
default:
@@ -1738,32 +1738,32 @@
if (isset($section_text['EXPECTF'])) {
-// do preg_quote, but miss out any %r delimited sections
-$temp = ;
-$r = %r;
-$startOffset = 0;
-$length = strlen($wanted_re);
-while($startOffset $length) {
- $start = strpos($wanted_re, $r, $startOffset);
- if ($start !== false) {
-// we have found a start tag
-$end = strpos($wanted_re, $r, $start+2);
-if ($end === false) {
- // unbalanced tag, ignore it.
- $end = $start = $length;
-}
- } else {
-// no more %r sections
-$start = $end = $length;
- }
- // quote a non re portion of the string
- $temp = $temp . preg_quote(substr($wanted_re, $startOffset,
($start - $startOffset)), '/');
- // add the re unquoted.
- $temp = $temp . substr($wanted_re, $start+2, ($end -
$start-2));
- $startOffset = $end + 2;
-}
-$wanted_re = $temp;
-
+ // do preg_quote, but miss out any %r delimited sections
+ $temp = ;
+ $r = %r;
+ $startOffset = 0;
+ $length = strlen($wanted_re);
+ while($startOffset $length) {
+ $start = strpos($wanted_re, $r, $startOffset);
+ if ($start !== false) {
+ // we have found a start tag
+ $end = strpos($wanted_re, $r, $start+2);
+ if ($end === false) {
+ // unbalanced tag, ignore it.
+ $end = $start = $length;
+ }
+ } else {
+ // no more %r sections
+ $start = $end = $length;
+ }
+ // quote a non re portion of the string
+ $temp = $temp . preg_quote(substr($wanted_re,
$startOffset, ($start - $startOffset)), '/');
+ // add the re unquoted.
+ $temp = $temp . '(' . substr($wanted_re,
$start+2, ($end - $start-2)). ')';
+ $startOffset = $end + 2;
+ }
+ $wanted_re = $temp;
+
$wanted_re = str_replace(
array('%binary_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'binary string',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php
zoe Thu Mar 12 20:45:43 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
refixing %r in run-tests.php (thanks iain lewis for the fix)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.58r2=1.226.2.37.2.59diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.58
php-src/run-tests.php:1.226.2.37.2.59
--- php-src/run-tests.php:1.226.2.37.2.58 Tue Mar 3 10:54:16 2009
+++ php-src/run-tests.php Thu Mar 12 20:45:43 2009
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.58 2009/03/03 10:54:16 zoe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.59 2009/03/12 20:45:43 zoe Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.58 $' .
\n;
+ echo '$Revision: 1.226.2.37.2.59 $' .
\n;
exit(1);
default:
@@ -1739,31 +1739,32 @@
if (isset($section_text['EXPECTF'])) {
-// do preg_quote, but miss out any %r delimited sections
-$temp = ;
-$r = %r;
-$startOffset = 0;
-$length = strlen($wanted_re);
-while($startOffset $length) {
- $start = strpos($wanted_re, $r, $startOffset);
- if ($start !== false) {
-// we have found a start tag
-$end = strpos($wanted_re, $r, $start+2);
-if ($end === false) {
- // unbalanced tag, ignore it.
- $end = $start = $length;
-}
- } else {
-// no more %r sections
-$start = $end = $length;
- }
- // quote a non re portion of the string
- $temp = $temp . preg_quote(substr($wanted_re, $startOffset,
($start - $startOffset)), '/');
- // add the re unquoted.
- $temp = $temp . substr($wanted_re, $start+2, ($end -
$start-2));
- $startOffset = $end + 2;
-}
-$wanted_re = $temp;
+ // do preg_quote, but miss out any %r delimited sections
+ $temp = ;
+ $r = %r;
+ $startOffset = 0;
+ $length = strlen($wanted_re);
+ while($startOffset $length) {
+ $start = strpos($wanted_re, $r, $startOffset);
+ if ($start !== false) {
+ // we have found a start tag
+ $end = strpos($wanted_re, $r, $start+2);
+ if ($end === false) {
+ // unbalanced tag, ignore it.
+ $end = $start = $length;
+ }
+ } else {
+ // no more %r sections
+ $start = $end = $length;
+ }
+ // quote a non re portion of the string
+ $temp = $temp . preg_quote(substr($wanted_re,
$startOffset, ($start - $startOffset)), '/');
+ // add the re unquoted.
+ $temp = $temp . '(' . substr($wanted_re,
$start+2, ($end - $start-2)). ')';
+ $startOffset = $end + 2;
+ }
+ $wanted_re = $temp;
+
$wanted_re = str_replace(
array('%binary_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'binary string',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings highlight_file.phpt ZendEngine2 zend_language_scanner.c zend_language_scanner.l zend_language_scanner_defs.h zend_stream.h
shire Wed Mar 11 22:11:54 2009 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend_language_scanner.c zend_language_scanner.l zend_language_scanner_defs.h zend_stream.h /php-src/ext/standard/tests/strings highlight_file.phpt Log: MFH: Add proper EOF handling for language scanner. Fixes bug #46817. This is not really the right fix.. I can accept this solution *temporarily*, but this breaks BC.. We need a better solution in the long run. I'm sorry but I haven't had time to work on this lately.. Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings highlight_file.phpt ZendEngine2 zend_language_scanner.c zend_language_scanner.l zend_language_scanner_defs.h zend_stream.h
Nuno Lopes wrote: shire Wed Mar 11 22:11:54 2009 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend_language_scanner.c zend_language_scanner.l zend_language_scanner_defs.h zend_stream.h /php-src/ext/standard/tests/strings highlight_file.phpt Log: MFH: Add proper EOF handling for language scanner. Fixes bug #46817. This is not really the right fix.. I can accept this solution *temporarily*, but this breaks BC.. We need a better solution in the long run. I'm sorry but I haven't had time to work on this lately.. Understood, working on a fix. If I can't get a fix in for this today I'll revert. If this is causing issues for anyone right now let me know and I'll back the change out of course... -shire -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/pgsql pgsql.c
iliaa Thu Mar 12 22:53:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pgsql pgsql.c
Log:
Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a string
literal)
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.24.2.26r2=1.331.2.13.2.24.2.27diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.26
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.27
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.24.2.26 Sun Jan 18 23:49:31 2009
+++ php-src/ext/pgsql/pgsql.c Thu Mar 12 22:53:16 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.331.2.13.2.24.2.26 2009/01/18 23:49:31 felipe Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.24.2.27 2009/03/12 22:53:16 iliaa Exp $ */
#include stdlib.h
@@ -3890,7 +3890,7 @@
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, PostgreSQL
link, le_link, le_plink);
- spprintf(query, 0, COPY \%s\ FROM STDIN DELIMITERS '%c' WITH NULL
AS '%s', table_name, *pg_delim, pg_null_as);
+ spprintf(query, 0, COPY \%s\ FROM STDIN DELIMITERS E'%c' WITH NULL
AS E'%s', table_name, *pg_delim, pg_null_as);
while ((pgsql_result = PQgetResult(pgsql))) {
PQclear(pgsql_result);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pgsql pgsql.c
iliaa Thu Mar 12 22:53:37 2009 UTC
Modified files:
/php-src/ext/pgsql pgsql.c
Log:
Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a string
literal)
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.399r2=1.400diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.399 php-src/ext/pgsql/pgsql.c:1.400
--- php-src/ext/pgsql/pgsql.c:1.399 Tue Mar 10 23:39:31 2009
+++ php-src/ext/pgsql/pgsql.c Thu Mar 12 22:53:37 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.399 2009/03/10 23:39:31 helly Exp $ */
+/* $Id: pgsql.c,v 1.400 2009/03/12 22:53:37 iliaa Exp $ */
#include stdlib.h
@@ -3889,7 +3889,7 @@
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, PostgreSQL
link, le_link, le_plink);
- spprintf(query, 0, COPY \%s\ FROM STDIN DELIMITERS '%c' WITH NULL
AS '%s', table_name, *pg_delim, pg_null_as);
+ spprintf(query, 0, COPY \%s\ FROM STDIN DELIMITERS E'%c' WITH NULL
AS E'%s', table_name, *pg_delim, pg_null_as);
while ((pgsql_result = PQgetResult(pgsql))) {
PQclear(pgsql_result);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/pgsql pgsql.c
iliaa Thu Mar 12 22:54:15 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pgsql pgsql.c
/php-srcNEWS
Log:
MFB: Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a
string
literal)
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.331.2.13.2.36r2=1.331.2.13.2.37diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.331.2.13.2.36
php-src/ext/pgsql/pgsql.c:1.331.2.13.2.37
--- php-src/ext/pgsql/pgsql.c:1.331.2.13.2.36 Tue Jan 27 14:44:07 2009
+++ php-src/ext/pgsql/pgsql.c Thu Mar 12 22:54:15 2009
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.331.2.13.2.36 2009/01/27 14:44:07 felipe Exp $ */
+/* $Id: pgsql.c,v 1.331.2.13.2.37 2009/03/12 22:54:15 iliaa Exp $ */
#include stdlib.h
@@ -3469,7 +3469,7 @@
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, PostgreSQL
link, le_link, le_plink);
- spprintf(query, 0, COPY \%s\ FROM STDIN DELIMITERS '%c' WITH NULL
AS '%s', table_name, *pg_delim, pg_null_as);
+ spprintf(query, 0, COPY \%s\ FROM STDIN DELIMITERS E'%c' WITH NULL
AS E'%s', table_name, *pg_delim, pg_null_as);
while ((pgsql_result = PQgetResult(pgsql))) {
PQclear(pgsql_result);
}
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1434r2=1.2027.2.547.2.1435diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1434 php-src/NEWS:1.2027.2.547.2.1435
--- php-src/NEWS:1.2027.2.547.2.1434Sun Mar 8 18:22:26 2009
+++ php-src/NEWSThu Mar 12 22:54:15 2009
@@ -3,6 +3,8 @@
?? ??? 2009, PHP 5.2.10
- Fixed memory corruptions while reading properties of zip files. (Ilia)
+- Fixed bug #47639 (pg_copy_from() WARNING: nonstandard use of \\ in a string
+ literal). (Ilia)
- Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia)
- Fixed bug #47546 (Default value for limit parameter in explode is 0, not -1).
(Kalle)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/oci8 config.m4
sixdThu Mar 12 23:52:20 2009 UTC
Modified files:
/php-src/ext/oci8 config.m4
Log:
Fixed PECL Bug 14268 (Allow 'pecl install oci8' command to 'autodetect' an
Instant Client RPM install) refactor
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.76r2=1.77diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.76 php-src/ext/oci8/config.m4:1.77
--- php-src/ext/oci8/config.m4:1.76 Mon Mar 9 17:40:59 2009
+++ php-src/ext/oci8/config.m4 Thu Mar 12 23:52:20 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.76 2009/03/09 17:40:59 sixd Exp $
+dnl $Id: config.m4,v 1.77 2009/03/12 23:52:20 sixd Exp $
dnl
if test -z $SED; then
@@ -25,25 +25,23 @@
])
AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
- AC_CHECK_SIZEOF(long int, 4)
- AC_MSG_CHECKING([if we're on a 64-bit platform])
- if test $ac_cv_sizeof_long_int = 4 ; then
-AC_MSG_RESULT([no])
-TMP_OCI8_LIB_DIR=lib32
- else
-AC_MSG_RESULT([yes])
-TMP_OCI8_LIB_DIR=lib
+ AC_MSG_CHECKING([ORACLE_HOME library validity])
+ if test ! -d $OCI8_DIR; then
+AC_MSG_ERROR([${OCI8_DIR} is not a directory])
fi
-
- AC_MSG_CHECKING([OCI8 libraries dir])
if test -d $OCI8_DIR/lib test ! -d $OCI8_DIR/lib32; then
OCI8_LIB_DIR=lib
elif test ! -d $OCI8_DIR/lib test -d $OCI8_DIR/lib32; then
OCI8_LIB_DIR=lib32
elif test -d $OCI8_DIR/lib test -d $OCI8_DIR/lib32; then
-OCI8_LIB_DIR=$TMP_OCI8_LIB_DIR
+OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
else
-AC_MSG_ERROR([Oracle (OCI8) required libraries not found])
+dnl This isn't an ORACLE_HOME. Try heuristic examination of the dir to
help the user
+if test -f $OCI8_DIR/libociei.so; then
+ AC_MSG_ERROR([Expected an ORACLE_HOME top level directory but
${OCI8_DIR} appears to be an Instant Client directory. Try
--with-oci8=instantclient,${OCI8_DIR}])
+else
+ AC_MSG_ERROR([Oracle library directory not found in ${OCI8_DIR}])
+fi
fi
AC_MSG_RESULT($OCI8_LIB_DIR)
])
@@ -84,7 +82,7 @@
OCI8_ORACLE_VERSION=11.1
elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
dnl There is no case for Oracle 10.2. Oracle 10.2 libraries have a 10.1
suffix for drop-in compatibility with Oracle 10.1
-OCI8_ORACLE_VERSION=10.1
+OCI8_ORACLE_VERSION=10.1
elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
dnl There is no case for Oracle 9.2. Oracle 9.2 libraries have a 9.0
suffix for drop-in compatibility with Oracle 9.0
OCI8_ORACLE_VERSION=9.0
@@ -110,10 +108,18 @@
dnl --with-oci8=shared,/path/to/oracle/home
PHP_ARG_WITH(oci8, for Oracle (OCI8) support,
[ --with-oci8[=DIR] Include Oracle (OCI8) support. DIR defaults to
\$ORACLE_HOME.
- Use --with-oci8=instantclient,/path/to/oic/lib
- for an Oracle Instant Client installation])
+ Use
--with-oci8=instantclient,/path/to/instant/client/lib
+ to use an Oracle Instant Client installation])
if test $PHP_OCI8 != no; then
+
+ if test -z $PHP_OCI8; then
+dnl --with-oci8=$ORACLE_HOME where ORACLE_HOME isn't set (or is mistyped)
will match this case
+AC_MSG_ERROR([Empty parameter value passed to --with-oci8])
+ fi
+
+ dnl Check PHP version is compatible with this extension
+
AC_MSG_CHECKING([PHP version])
tmp_version=$PHP_VERSION
@@ -121,9 +127,9 @@
if test -z $PHP_CONFIG; then
AC_MSG_ERROR([php-config not found])
fi
-php_version=`$PHP_CONFIG --version 2/dev/null|head -n 1|sed -e
's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
+php_version=`$PHP_CONFIG --version 2/dev/null|head -n 1|$PHP_OCI8_SED -e
's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
else
-php_version=`echo $tmp_version|sed -e
's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
+php_version=`echo $tmp_version|$PHP_OCI8_SED -e
's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
fi
if test -z $php_version; then
@@ -141,187 +147,212 @@
else
AC_MSG_RESULT([$php_version, ok])
fi
-fi
-PHP_OCI8_INSTANT_CLIENT=no
+ dnl Set some port specific directory components for use later
-if test `echo $PHP_OCI8` = instantclient; then
+ AC_CHECK_SIZEOF(long int, 4)
+ AC_MSG_CHECKING([checking if we're on a 64-bit platform])
+ if test $ac_cv_sizeof_long_int = 4; then
+AC_MSG_RESULT([no])
+PHP_OCI8_OH_LIBDIR=lib32
+PHP_OCI8_IC_LIBDIR_SUFFIX=
+ else
+AC_MSG_RESULT([yes])
+PHP_OCI8_OH_LIBDIR=lib
+PHP_OCI8_IC_LIBDIR_SUFFIX=64
+ fi
+
+ dnl Determine if the user wants to use Oracle Instant Client libraries
+
+ PHP_OCI8_INSTANT_CLIENT=no
+
+ dnl PECL Bug 14268 (Allow pecl install oci8 command to autodetect
+ dnl an Instant Client RPM install). This also has a benefit for non
+ dnl pecl install builds: if the user does --with-oci8 or
+ dnl --with-oci8=shared but the ORACLE_HOME environment variable is not
+ dnl actually set, the install tries to
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/oci8 config.m4
sixdThu Mar 12 23:52:37 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 config.m4
Log:
MFH: Fixed PECL Bug 14268 (Allow 'pecl install oci8' command to 'autodetect'
an Instant Client RPM install) refactor
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.11.2.6r2=1.55.2.3.2.11.2.7diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.6
php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.7
--- php-src/ext/oci8/config.m4:1.55.2.3.2.11.2.6Mon Mar 9 17:42:22 2009
+++ php-src/ext/oci8/config.m4 Thu Mar 12 23:52:37 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.55.2.3.2.11.2.6 2009/03/09 17:42:22 sixd Exp $
+dnl $Id: config.m4,v 1.55.2.3.2.11.2.7 2009/03/12 23:52:37 sixd Exp $
dnl
if test -z $SED; then
@@ -25,25 +25,23 @@
])
AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[
- AC_CHECK_SIZEOF(long int, 4)
- AC_MSG_CHECKING([if we're on a 64-bit platform])
- if test $ac_cv_sizeof_long_int = 4 ; then
-AC_MSG_RESULT([no])
-TMP_OCI8_LIB_DIR=lib32
- else
-AC_MSG_RESULT([yes])
-TMP_OCI8_LIB_DIR=lib
+ AC_MSG_CHECKING([ORACLE_HOME library validity])
+ if test ! -d $OCI8_DIR; then
+AC_MSG_ERROR([${OCI8_DIR} is not a directory])
fi
-
- AC_MSG_CHECKING([OCI8 libraries dir])
if test -d $OCI8_DIR/lib test ! -d $OCI8_DIR/lib32; then
OCI8_LIB_DIR=lib
elif test ! -d $OCI8_DIR/lib test -d $OCI8_DIR/lib32; then
OCI8_LIB_DIR=lib32
elif test -d $OCI8_DIR/lib test -d $OCI8_DIR/lib32; then
-OCI8_LIB_DIR=$TMP_OCI8_LIB_DIR
+OCI8_LIB_DIR=$PHP_OCI8_OH_LIBDIR
else
-AC_MSG_ERROR([Oracle (OCI8) required libraries not found])
+dnl This isn't an ORACLE_HOME. Try heuristic examination of the dir to
help the user
+if test -f $OCI8_DIR/libociei.so; then
+ AC_MSG_ERROR([Expected an ORACLE_HOME top level directory but
${OCI8_DIR} appears to be an Instant Client directory. Try
--with-oci8=instantclient,${OCI8_DIR}])
+else
+ AC_MSG_ERROR([Oracle library directory not found in ${OCI8_DIR}])
+fi
fi
AC_MSG_RESULT($OCI8_LIB_DIR)
])
@@ -84,7 +82,7 @@
OCI8_ORACLE_VERSION=11.1
elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
dnl There is no case for Oracle 10.2. Oracle 10.2 libraries have a 10.1
suffix for drop-in compatibility with Oracle 10.1
-OCI8_ORACLE_VERSION=10.1
+OCI8_ORACLE_VERSION=10.1
elif test -f $OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
dnl There is no case for Oracle 9.2. Oracle 9.2 libraries have a 9.0
suffix for drop-in compatibility with Oracle 9.0
OCI8_ORACLE_VERSION=9.0
@@ -110,10 +108,18 @@
dnl --with-oci8=shared,/path/to/oracle/home
PHP_ARG_WITH(oci8, for Oracle (OCI8) support,
[ --with-oci8[=DIR] Include Oracle (OCI8) support. DIR defaults to
\$ORACLE_HOME.
- Use --with-oci8=instantclient,/path/to/oic/lib
- for an Oracle Instant Client installation])
+ Use
--with-oci8=instantclient,/path/to/instant/client/lib
+ to use an Oracle Instant Client installation])
if test $PHP_OCI8 != no; then
+
+ if test -z $PHP_OCI8; then
+dnl --with-oci8=$ORACLE_HOME where ORACLE_HOME isn't set (or is mistyped)
will match this case
+AC_MSG_ERROR([Empty parameter value passed to --with-oci8])
+ fi
+
+ dnl Check PHP version is compatible with this extension
+
AC_MSG_CHECKING([PHP version])
tmp_version=$PHP_VERSION
@@ -121,9 +127,9 @@
if test -z $PHP_CONFIG; then
AC_MSG_ERROR([php-config not found])
fi
-php_version=`$PHP_CONFIG --version 2/dev/null|head -n 1|sed -e
's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
+php_version=`$PHP_CONFIG --version 2/dev/null|head -n 1|$PHP_OCI8_SED -e
's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
else
-php_version=`echo $tmp_version|sed -e
's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
+php_version=`echo $tmp_version|$PHP_OCI8_SED -e
's#\([0-9]\.[0-9]*\.[0-9]*\)\(.*\)#\1#'`
fi
if test -z $php_version; then
@@ -138,190 +144,217 @@
if test $oci8_php_version -lt 4003009; then
AC_MSG_ERROR([You need at least PHP 4.3.9 to be able to use this version
of OCI8. PHP $php_version found])
+ elif test $oci8_php_version -ge 600; then
+AC_MSG_ERROR([This version of OCI8 is not compatible with PHP 6 or higher])
else
AC_MSG_RESULT([$php_version, ok])
fi
-fi
-PHP_OCI8_INSTANT_CLIENT=no
+ dnl Set some port specific directory components for use later
+
+ AC_CHECK_SIZEOF(long int, 4)
+ AC_MSG_CHECKING([checking if we're on a 64-bit platform])
+ if test $ac_cv_sizeof_long_int = 4; then
+AC_MSG_RESULT([no])
+PHP_OCI8_OH_LIBDIR=lib32
+PHP_OCI8_IC_LIBDIR_SUFFIX=
+ else
+AC_MSG_RESULT([yes])
+PHP_OCI8_OH_LIBDIR=lib
+PHP_OCI8_IC_LIBDIR_SUFFIX=64
+ fi
+
+ dnl Determine if the user wants to use Oracle Instant Client
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
sixdThu Mar 12 23:59:11 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: Add PECL Bug #14268 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.508r2=1.2027.2.547.2.965.2.509diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.508 php-src/NEWS:1.2027.2.547.2.965.2.509 --- php-src/NEWS:1.2027.2.547.2.965.2.508 Wed Mar 11 16:59:23 2009 +++ php-src/NEWSThu Mar 12 23:59:11 2009 @@ -36,8 +36,9 @@ - Fixed bug #45432 (PDO: persistent connection leak). (Felipe) - Fixed bug #43831 ($this gets mangled when extending PDO with persistent connection). (Felipe) -- Fixed PECL Bug #15988 (OCI8: sqlnet.ora isn't read with older Oracle libraries) (Chris Jones/Oracle Corp.) - Fixed PECL Bug #16035 (OCI8: oci_connect without ORACLE_HOME defined causes segfault) (Chris Jones/Oracle Corp.) +- Fixed PECL Bug #15988 (OCI8: sqlnet.ora isn't read with older Oracle libraries) (Chris Jones/Oracle Corp.) +- Fixed PECL Bug #14268 (Allow pecl install oci8 command to autodetect an Instant Client RPM install) (Chris Jones/Oracle Corp.) 29 Jan 2009, PHP 5.3.0 Beta 1 - Upgraded bundled sqlite to version 3.6.10. (Scott, Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
