[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Feb 5 01:32:40 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3309r2=1.3310diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3309 php-src/ChangeLog:1.3310 --- php-src/ChangeLog:1.3309Wed Feb 4 01:32:28 2009 +++ php-src/ChangeLog Thu Feb 5 01:32:39 2009 @@ -1,3 +1,34 @@ +2009-02-04 Felipe Pena felipe...@gmail.com + +* (PHP_5_2) + ext/pdo/tests/pdo_033.phpt + ext/pdo/tests/pdo_033.phpt: + - MFH: Fixed bug #47297 (pdo_033.phpt fails on PgSQL) + Patch by matteo at beccati dot com + +* ext/pdo/tests/pdo_033.phpt: + - Fixed bug #47297 (pdo_033.phpt fails on PgSQL) + Patch by matteo at beccati dot com + +2009-02-04 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + configure.in + main/spprintf.c: + + Syn spprintf fix with that of 5.3 and above + +2009-02-04 Pierre-Alain Joye pierre@gmail.com + +* ext/sqlite3/sqlite3.c: + - fix build + +2009-02-04 David Coallier david.coall...@gmail.com + +* ext/simplexml/simplexml.c + ext/simplexml/tests/bug46048.phpt: + - MFB (Fixed Bug #46048: SimpleXML top-level @attributes not in iterator). + 2009-02-03 David Coallier david.coall...@gmail.com * (PHP_5_3) @@ -29374,7 +29405,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3309 2009/02/04 01:32:28 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3310 2009/02/05 01:32:39 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src /ext/sqlite3 sqlite3.c
pajoye Wed Feb 4 09:58:39 2009 UTC
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
- fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.33 php-src/ext/sqlite3/sqlite3.c:1.34
--- php-src/ext/sqlite3/sqlite3.c:1.33 Sat Jan 24 13:08:35 2009
+++ php-src/ext/sqlite3/sqlite3.c Wed Feb 4 09:58:39 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.33 2009/01/24 13:08:35 tony2001 Exp $ */
+/* $Id: sqlite3.c,v 1.34 2009/02/04 09:58:39 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1038,7 +1038,7 @@
return -1;
}
-PHPAPI php_stream_ops php_stream_sqlite3_ops = {
+static php_stream_ops php_stream_sqlite3_ops = {
php_sqlite3_stream_write,
php_sqlite3_stream_read,
php_sqlite3_stream_close,
--
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/simplexml simplexml.c /ext/simplexml/tests bug46048.phpt
2009/2/4 Ilia Alshanetsky i...@prohost.org: MFH to 5.2? This bug doesn't happen in 5.2. It was introduced in HEAD then 5.3 by adding the debugging object helpers. Cheers, -- Slan, David -- 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) / configure.in /main spprintf.c
iliaa Wed Feb 4 15:03:12 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcconfigure.in
/php-src/main spprintf.c
Log:
Syn spprintf fix with that of 5.3 and above
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.121r2=1.579.2.52.2.122diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.52.2.121
php-src/configure.in:1.579.2.52.2.122
--- php-src/configure.in:1.579.2.52.2.121 Sun Feb 1 21:52:32 2009
+++ php-src/configure.inWed Feb 4 15:03:11 2009
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.579.2.52.2.121 2009/02/01 21:52:32 dsp Exp $ -*-
autoconf -*-
+## $Id: configure.in,v 1.579.2.52.2.122 2009/02/04 15:03:11 iliaa Exp $ -*-
autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -579,6 +579,7 @@
strdup \
strerror \
strftime \
+strnlen \
strptime \
strstr \
strtok_r \
http://cvs.php.net/viewvc.cgi/php-src/main/spprintf.c?r1=1.25.2.2.2.14r2=1.25.2.2.2.15diff_format=u
Index: php-src/main/spprintf.c
diff -u php-src/main/spprintf.c:1.25.2.2.2.14
php-src/main/spprintf.c:1.25.2.2.2.15
--- php-src/main/spprintf.c:1.25.2.2.2.14 Sun Feb 1 19:42:48 2009
+++ php-src/main/spprintf.c Wed Feb 4 15:03:12 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spprintf.c,v 1.25.2.2.2.14 2009/02/01 19:42:48 iliaa Exp $ */
+/* $Id: spprintf.c,v 1.25.2.2.2.15 2009/02/04 15:03:12 iliaa Exp $ */
/* This is the spprintf implementation.
* It has emerged from apache snprintf. See original header:
@@ -180,6 +180,13 @@
/* }}} */
+#if !HAVE_STRNLEN
+static size_t strnlen(const char *s, size_t maxlen) {
+ char *r = memchr(s, '\0', maxlen);
+ return r ? r-s : maxlen;
+}
+#endif
+
/*
* Do format conversion placing the output in buffer
*/
@@ -547,10 +554,10 @@
case 'v':
s = va_arg(ap, char *);
if (s != NULL) {
- if (adjust_precision
precision) {
- s_len = precision;
- } else {
+ if (!adjust_precision) {
s_len = strlen(s);
+ } else {
+ s_len = strnlen(s,
precision);
}
} else {
s = S_NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo/tests pdo_033.phpt
felipe Wed Feb 4 16:40:13 2009 UTC
Modified files:
/php-src/ext/pdo/tests pdo_033.phpt
Log:
- Fixed bug #47297 (pdo_033.phpt fails on PgSQL)
Patch by matteo at beccati dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/pdo_033.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/pdo/tests/pdo_033.phpt
diff -u php-src/ext/pdo/tests/pdo_033.phpt:1.1
php-src/ext/pdo/tests/pdo_033.phpt:1.2
--- php-src/ext/pdo/tests/pdo_033.phpt:1.1 Mon Jul 10 14:05:46 2006
+++ php-src/ext/pdo/tests/pdo_033.phpt Wed Feb 4 16:40:13 2009
@@ -18,7 +18,9 @@
$quoted = $db-quote($unquoted);
-$db-query(CREATE TABLE test (t char(100)));
+$len = strlen($unquoted);
+
+$db-query(CREATE TABLE test (t char($len)));
$db-query(INSERT INTO test (t) VALUES($quoted));
$stmt = $db-prepare('SELECT * from test');
--
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/pdo/tests pdo_033.phpt
felipe Wed Feb 4 16:40:56 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo/tests pdo_033.phpt
Log:
- MFH: Fixed bug #47297 (pdo_033.phpt fails on PgSQL)
Patch by matteo at beccati dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/pdo_033.phpt?r1=1.1.2.2r2=1.1.2.2.2.1diff_format=u
Index: php-src/ext/pdo/tests/pdo_033.phpt
diff -u php-src/ext/pdo/tests/pdo_033.phpt:1.1.2.2
php-src/ext/pdo/tests/pdo_033.phpt:1.1.2.2.2.1
--- php-src/ext/pdo/tests/pdo_033.phpt:1.1.2.2 Mon Jul 10 14:06:13 2006
+++ php-src/ext/pdo/tests/pdo_033.phpt Wed Feb 4 16:40:56 2009
@@ -18,7 +18,9 @@
$quoted = $db-quote($unquoted);
-$db-query(CREATE TABLE test (t char(100)));
+$len = strlen($unquoted);
+
+$db-query(CREATE TABLE test (t char($len)));
$db-query(INSERT INTO test (t) VALUES($quoted));
$stmt = $db-prepare('SELECT * from test');
--
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) /ext/pdo/tests pdo_033.phpt
felipe Wed Feb 4 16:41:18 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo/tests pdo_033.phpt
Log:
- MFH: Fixed bug #47297 (pdo_033.phpt fails on PgSQL)
Patch by matteo at beccati dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/tests/pdo_033.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/pdo/tests/pdo_033.phpt
diff -u php-src/ext/pdo/tests/pdo_033.phpt:1.1.2.2
php-src/ext/pdo/tests/pdo_033.phpt:1.1.2.3
--- php-src/ext/pdo/tests/pdo_033.phpt:1.1.2.2 Mon Jul 10 14:06:13 2006
+++ php-src/ext/pdo/tests/pdo_033.phpt Wed Feb 4 16:41:18 2009
@@ -18,7 +18,9 @@
$quoted = $db-quote($unquoted);
-$db-query(CREATE TABLE test (t char(100)));
+$len = strlen($unquoted);
+
+$db-query(CREATE TABLE test (t char($len)));
$db-query(INSERT INTO test (t) VALUES($quoted));
$stmt = $db-prepare('SELECT * from test');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [TESTING] - svn: php/php-src/branches/PHP_5_3/
sixdThu, 05 Feb 2009 07:22:07 + Changed paths: U php/php-src/branches/PHP_5_3/README.EXTENSIONS Log: cj Modified: php/php-src/branches/PHP_5_3/README.EXTENSIONS === --- php/php-src/branches/PHP_5_3/README.EXTENSIONS 2009-02-03 08:53:30 UTC (rev 217553) +++ php/php-src/branches/PHP_5_3/README.EXTENSIONS 2009-02-05 07:22:07 UTC (rev 217554) @@ -37,3 +37,5 @@ If you don't care about source compatibility with earlier PHP releases than 4.1.0, you can drop the #if/#endif lines. + + -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [TESTING] - svn: php/pecl/oci8/branches/PHP_5_3/
sixdThu, 05 Feb 2009 07:22:40 + Changed paths: U php/pecl/oci8/branches/PHP_5_3/php_oci8.h Log: cj Modified: php/pecl/oci8/branches/PHP_5_3/php_oci8.h === --- php/pecl/oci8/branches/PHP_5_3/php_oci8.h 2009-02-05 07:22:07 UTC (rev 217554) +++ php/pecl/oci8/branches/PHP_5_3/php_oci8.h 2009-02-05 07:22:40 UTC (rev 217555) @@ -29,7 +29,7 @@ #if HAVE_OCI8 # ifndef PHP_OCI8_H -# define PHP_OCI8_H +# define PHP_OCI8_H #ifdef ZTS # include TSRM.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] [TESTING] - svn: php/pecl/oci8/branches/PHP_5_3/
sixdThu, 05 Feb 2009 07:23:08 + Changed paths: U php/pecl/oci8/branches/PHP_5_3/oci8_lob.c Log: cj Modified: php/pecl/oci8/branches/PHP_5_3/oci8_lob.c === --- php/pecl/oci8/branches/PHP_5_3/oci8_lob.c 2009-02-05 07:22:40 UTC (rev 217555) +++ php/pecl/oci8/branches/PHP_5_3/oci8_lob.c 2009-02-05 07:23:08 UTC (rev 217556) @@ -917,11 +917,3 @@ #endif /* HAVE_OCI8 */ -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * End: - * vim600: noet sw=4 ts=4 fdm=marker - * vim600: noet sw=4 ts=4 - */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
