[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Nov 23 01:32:18 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3236r2=1.3237diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3236 php-src/ChangeLog:1.3237 --- php-src/ChangeLog:1.3236Sat Nov 22 01:32:12 2008 +++ php-src/ChangeLog Sun Nov 23 01:32:17 2008 @@ -1,3 +1,135 @@ +2008-11-22 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/mysqlnd/php_mysqlnd.c: + - declaration first (fix build win) + +2008-11-22 David Coallier [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS: + - Removed the unreleased-fix-feature entry as per Marcus's request + - Made sure to include my PDO fix in the proper 5.3 release + +2008-11-22 Scott MacVicar [EMAIL PROTECTED] + +* (PHP_5_3) + ext/sqlite3/libsqlite/php-sqlite3-changes.patch: + MFH Patch file for sqlite3 amalgamation so things don't get missed. + +2008-11-22 Felipe Pena [EMAIL PROTECTED] + +* ext/gettext/gettext.c: + - Fixed segfault [only in this branch] + +2008-11-22 Scott MacVicar [EMAIL PROTECTED] + +* ext/sqlite3/libsqlite/php-sqlite3-changes.patch + ext/sqlite3/libsqlite/php-sqlite3-changes.patch: + + Patch file for sqlite3 amalgamation so things don't get missed. + +* (PHP_5_3) + main/php.h + win32/build/config.w32.h.in: + MFH Better fix for va_copy since some architectures like to do a deep copy. + +* main/php.h + win32/build/config.w32.h.in: + Better fix for va_copy since some architectures like to do a deep copy. + +2008-11-22 David Coallier [EMAIL PROTECTED] + +* NEWS: + - Removed my duplicate news entry + +2008-11-22 Felipe Pena [EMAIL PROTECTED] + +* ext/curl/interface.c: + - Fixed segfault [only in this branch, because add_next_* are macro] + +2008-11-22 David Coallier [EMAIL PROTECTED] + +* NEWS: + - Added the fixed bug #46615 + +* (PHP_5_3) + NEWS: + - Added news item for bug #46615 + +* (PHP_5_3) + ext/spl/spl_heap.c + ext/spl/tests/heap_007.phpt + ext/spl/tests/pqueue_003.phpt: + - MFH + - Bug #46615 + - Return the count - 1 when invoking SplHeap-key() + - Adjusted the tests + +* ext/spl/spl_heap.c: + - Return the key - 1 + - Bug #46615 + +* ext/spl/tests/heap_007.phpt + ext/spl/tests/pqueue_003.phpt: + - Added tests for bug #46615 (Adjustments) + +2008-11-22 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/sqlite3/libsqlite/sqlite3.c: + - MFB: Fix windows build + +* (PHP_5_3) + ext/sqlite3/libsqlite/sqlite3.c: + - Fix windows build + please keep the fixes while merging the new versions. + if the updates do not contain the fixes, create a little todo list so + it is + not forgotten (wiki) + +* win32/build/config.w32.h.in: + - MFB: make va_copy safer using () around arguments + +* (PHP_5_3) + win32/build/config.w32.h.in: + - make va_copy safer using () around arguments + +2008-11-22 Scott MacVicar [EMAIL PROTECTED] + +* win32/build/config.w32.h.in: + Fix build on Windows + +* (PHP_5_3) + ext/sqlite/sqlite.c: + MFH Error handler isn't properly restored when using fetchObject() with + SQLite + +* ext/sqlite/sqlite.c: + Error handler isn't properly restored when using fetchObject() with SQLite + +2008-11-22 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + - BFN + +2008-11-22 Scott MacVicar [EMAIL PROTECTED] + +* ext/sqlite3/libsqlite/sqlite3.c + ext/sqlite3/libsqlite/sqlite3.h + ext/sqlite3/libsqlite/sqlite3ext.h: + Update libsqlite to 3.6.6 + +* (PHP_5_3) + ext/fileinfo/libmagic/print.c + ext/fileinfo/tests/finfo_open_error.phpt: + MFH Warnings from libmagic should be notices rather than sent to stderr, + this fixes a test on Windows + +* ext/fileinfo/libmagic/print.c + ext/fileinfo/tests/finfo_open_error.phpt: + Warnings from libmagic should be notices rather than sent to stderr, this + fixes a test on Windows + 2008-11-21 Felipe Pena [EMAIL PROTECTED] * ext/reflection/php_reflection.c: @@ -14001,7 +14133,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3236 2008/11/22 01:32:12 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3237 2008/11/23 01:32:17 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic print.c /ext/fileinfo/tests finfo_open_error.phpt
scottmacSat Nov 22 10:27:19 2008 UTC
Modified files:
/php-src/ext/fileinfo/libmagic print.c
/php-src/ext/fileinfo/tests finfo_open_error.phpt
Log:
Warnings from libmagic should be notices rather than sent to stderr, this
fixes a test on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/print.c?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/fileinfo/libmagic/print.c
diff -u php-src/ext/fileinfo/libmagic/print.c:1.4
php-src/ext/fileinfo/libmagic/print.c:1.5
--- php-src/ext/fileinfo/libmagic/print.c:1.4 Wed Oct 15 22:57:22 2008
+++ php-src/ext/fileinfo/libmagic/print.c Sat Nov 22 10:27:19 2008
@@ -29,6 +29,8 @@
* print.c - debugging printout routines
*/
+#include php.h
+
#include file.h
#include stdio.h
#include errno.h
@@ -51,18 +53,16 @@
file_magwarn(struct magic_set *ms, const char *f, ...)
{
va_list va;
+ char *expanded_format;
+ TSRMLS_FETCH();
- /* cuz we use stdout for most, stderr here */
- (void) fflush(stdout);
-
- if (ms-file)
- (void) fprintf(stderr, %s, %lu: , ms-file,
- (unsigned long)ms-line);
- (void) fprintf(stderr, Warning: );
va_start(va, f);
- (void) vfprintf(stderr, f, va);
+ vasprintf(expanded_format, f, va);
va_end(va);
- (void) fputc('\n', stderr);
+
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Warning: %s,
expanded_format);
+
+ efree(expanded_format);
}
protected const char *
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_open_error.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_open_error.phpt
diff -u php-src/ext/fileinfo/tests/finfo_open_error.phpt:1.2
php-src/ext/fileinfo/tests/finfo_open_error.phpt:1.3
--- php-src/ext/fileinfo/tests/finfo_open_error.phpt:1.2Fri Aug 29
10:34:34 2008
+++ php-src/ext/fileinfo/tests/finfo_open_error.phptSat Nov 22 10:27:19 2008
@@ -31,7 +31,8 @@
Warning: finfo_open() expects at most 2 parameters, 3 given in %s on line %d
bool(false)
-unknown, 0: Warning: using regular magic file `%s'
+
+Notice: finfo_open(): Warning: using regular magic file `%s' in %s on line %d
resource(%d) of type (file_info)
Warning: finfo_open() expects parameter 1 to be long,
%unicode_string_optional% given in %s on line %d
--
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/fileinfo/libmagic print.c /ext/fileinfo/tests finfo_open_error.phpt
scottmacSat Nov 22 10:29:05 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/fileinfo/libmagic print.c
/php-src/ext/fileinfo/tests finfo_open_error.phpt
Log:
MFH Warnings from libmagic should be notices rather than sent to stderr, this
fixes a test on Windows
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/print.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/fileinfo/libmagic/print.c
diff -u php-src/ext/fileinfo/libmagic/print.c:1.1.2.3
php-src/ext/fileinfo/libmagic/print.c:1.1.2.4
--- php-src/ext/fileinfo/libmagic/print.c:1.1.2.3 Wed Oct 15 22:56:57 2008
+++ php-src/ext/fileinfo/libmagic/print.c Sat Nov 22 10:29:05 2008
@@ -29,6 +29,8 @@
* print.c - debugging printout routines
*/
+#include php.h
+
#include file.h
#include stdio.h
#include errno.h
@@ -51,18 +53,16 @@
file_magwarn(struct magic_set *ms, const char *f, ...)
{
va_list va;
+ char *expanded_format;
+ TSRMLS_FETCH();
- /* cuz we use stdout for most, stderr here */
- (void) fflush(stdout);
-
- if (ms-file)
- (void) fprintf(stderr, %s, %lu: , ms-file,
- (unsigned long)ms-line);
- (void) fprintf(stderr, Warning: );
va_start(va, f);
- (void) vfprintf(stderr, f, va);
+ vasprintf(expanded_format, f, va);
va_end(va);
- (void) fputc('\n', stderr);
+
+ php_error_docref(NULL TSRMLS_CC, E_NOTICE, Warning: %s,
expanded_format);
+
+ efree(expanded_format);
}
protected const char *
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/tests/finfo_open_error.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/fileinfo/tests/finfo_open_error.phpt
diff -u php-src/ext/fileinfo/tests/finfo_open_error.phpt:1.1.2.1
php-src/ext/fileinfo/tests/finfo_open_error.phpt:1.1.2.2
--- php-src/ext/fileinfo/tests/finfo_open_error.phpt:1.1.2.1Fri Aug 29
10:29:55 2008
+++ php-src/ext/fileinfo/tests/finfo_open_error.phptSat Nov 22 10:29:05 2008
@@ -31,7 +31,8 @@
Warning: finfo_open() expects at most 2 parameters, 3 given in %s on line %d
bool(false)
-unknown, 0: Warning: using regular magic file `%s'
+
+Notice: finfo_open(): Warning: using regular magic file `%s' in %s on line %d
resource(%d) of type (file_info)
Warning: finfo_open() expects parameter 1 to be long,
%unicode_string_optional% given in %s on line %d
--
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
felipe Sat Nov 22 11:24:15 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: - BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1323r2=1.2027.2.547.2.1324diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1323 php-src/NEWS:1.2027.2.547.2.1324 --- php-src/NEWS:1.2027.2.547.2.1323Fri Nov 21 00:12:18 2008 +++ php-src/NEWSSat Nov 22 11:24:15 2008 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Nov 2008, PHP 5.2.7 +- Fixed memory leak inside readline_callback_handler_remove() function. (Felipe) 20 Nov 2008, PHP 5.2.7RC4 - Added logging option for error_log to send directly to SAPI. (Stas) -- 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/sqlite sqlite.c
scottmacSat Nov 22 11:48:42 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite sqlite.c
Log:
MFH Error handler isn't properly restored when using fetchObject() with SQLite
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.9.2.16r2=1.166.2.13.2.9.2.17diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.16
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.17
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.9.2.16 Wed Nov 19 02:00:53 2008
+++ php-src/ext/sqlite/sqlite.c Sat Nov 22 11:48:42 2008
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.166.2.13.2.9.2.16 2008/11/19 02:00:53 colder Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.9.2.17 2008/11/22 11:48:42 scottmac Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -114,16 +114,20 @@
} \
}
-#define RES_FROM_OBJECT(res, object) \
+#define RES_FROM_OBJECT_RESTORE_ERH(res, object, error_handling) \
{ \
sqlite_object *obj = (sqlite_object*)
zend_object_store_get_object(object TSRMLS_CC); \
res = obj-u.res; \
if (!res) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, No result
set available); \
+ if (error_handling) \
+ zend_restore_error_handling(error_handling
TSRMLS_CC); \
RETURN_NULL(); \
} \
}
+#define RES_FROM_OBJECT(res, object) RES_FROM_OBJECT_RESTORE_ERH(res, object,
NULL)
+
#define PHP_SQLITE_EMPTY_QUERY \
if (!sql_len) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot execute
empty query.); \
@@ -1454,7 +1458,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.13.2.9.2.16 2008/11/19
02:00:53 colder Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.13.2.9.2.17 2008/11/22
11:48:42 scottmac Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -2369,7 +2373,7 @@
zend_restore_error_handling(error_handling TSRMLS_CC);
return;
}
- RES_FROM_OBJECT(res, object);
+ RES_FROM_OBJECT_RESTORE_ERH(res, object, error_handling);
if (!ZEND_NUM_ARGS()) {
ce = zend_standard_class_def;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
scottmacSat Nov 22 11:48:38 2008 UTC
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Error handler isn't properly restored when using fetchObject() with SQLite
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.218r2=1.219diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.218 php-src/ext/sqlite/sqlite.c:1.219
--- php-src/ext/sqlite/sqlite.c:1.218 Wed Nov 19 01:59:07 2008
+++ php-src/ext/sqlite/sqlite.c Sat Nov 22 11:48:38 2008
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.218 2008/11/19 01:59:07 colder Exp $
+ $Id: sqlite.c,v 1.219 2008/11/22 11:48:38 scottmac Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -160,16 +160,20 @@
} \
}
-#define RES_FROM_OBJECT(res, object) \
+#define RES_FROM_OBJECT_RESTORE_ERH(res, object, error_handling) \
{ \
sqlite_object *obj = (sqlite_object*)
zend_object_store_get_object(object TSRMLS_CC); \
res = obj-u.res; \
if (!res) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, No result
set available); \
+ if (error_handling) \
+ zend_restore_error_handling(error_handling
TSRMLS_CC); \
RETURN_NULL(); \
} \
}
+#define RES_FROM_OBJECT(res, object) RES_FROM_OBJECT_RESTORE_ERH(res, object,
NULL)
+
#define PHP_SQLITE_EMPTY_QUERY \
if (!sql_len) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot execute
empty query); \
@@ -1546,7 +1550,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.218 2008/11/19 01:59:07 colder
Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.219 2008/11/22 11:48:38 scottmac
Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -2573,7 +2577,7 @@
zend_restore_error_handling(error_handling TSRMLS_CC);
return;
}
- RES_FROM_OBJECT(res, object);
+ RES_FROM_OBJECT_RESTORE_ERH(res, object, error_handling);
if (!ZEND_NUM_ARGS()) {
ce = zend_standard_class_def;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
scottmacSat Nov 22 12:39:13 2008 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: Fix build on Windows http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.17r2=1.18diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.17 php-src/win32/build/config.w32.h.in:1.18 --- php-src/win32/build/config.w32.h.in:1.17Sat Aug 23 20:03:29 2008 +++ php-src/win32/build/config.w32.h.in Sat Nov 22 12:39:13 2008 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.17 2008/08/23 20:03:29 pajoye Exp $ + $Id: config.w32.h.in,v 1.18 2008/11/22 12:39:13 scottmac Exp $ */ /* Define the minimum supported version */ @@ -159,3 +159,4 @@ #endif #define HAVE_STDLIB_H 1 +#define va_copy(ap1, ap2) memcpy(ap1, ap2, sizeof(va_list)) -- 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) /win32/build config.w32.h.in
scottmacSat Nov 22 12:39:16 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildconfig.w32.h.in Log: MFH Fix build on Windows http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.4.2.3.2.2r2=1.7.2.4.2.3.2.3diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.2 php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.3 --- php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.2 Mon Jul 28 11:50:34 2008 +++ php-src/win32/build/config.w32.h.in Sat Nov 22 12:39:16 2008 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.7.2.4.2.3.2.2 2008/07/28 11:50:34 pajoye Exp $ + $Id: config.w32.h.in,v 1.7.2.4.2.3.2.3 2008/11/22 12:39:16 scottmac Exp $ */ /* Define the minimum supported version */ @@ -160,3 +160,4 @@ #endif #define HAVE_STDLIB_H 1 +#define va_copy(ap1, ap2) memcpy(ap1, ap2, sizeof(va_list)) -- 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) /win32/build config.w32.h.in
pajoye Sat Nov 22 13:34:15 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildconfig.w32.h.in Log: - make va_copy safer using () around arguments http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.4.2.3.2.3r2=1.7.2.4.2.3.2.4diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.3 php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.4 --- php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.3 Sat Nov 22 12:39:16 2008 +++ php-src/win32/build/config.w32.h.in Sat Nov 22 13:34:15 2008 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.7.2.4.2.3.2.3 2008/11/22 12:39:16 scottmac Exp $ + $Id: config.w32.h.in,v 1.7.2.4.2.3.2.4 2008/11/22 13:34:15 pajoye Exp $ */ /* Define the minimum supported version */ @@ -160,4 +160,4 @@ #endif #define HAVE_STDLIB_H 1 -#define va_copy(ap1, ap2) memcpy(ap1, ap2, sizeof(va_list)) +#define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list)) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build config.w32.h.in
pajoye Sat Nov 22 13:39:04 2008 UTC Modified files: /php-src/win32/buildconfig.w32.h.in Log: - MFB: make va_copy safer using () around arguments http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.18r2=1.19diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.18 php-src/win32/build/config.w32.h.in:1.19 --- php-src/win32/build/config.w32.h.in:1.18Sat Nov 22 12:39:13 2008 +++ php-src/win32/build/config.w32.h.in Sat Nov 22 13:39:04 2008 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.18 2008/11/22 12:39:13 scottmac Exp $ + $Id: config.w32.h.in,v 1.19 2008/11/22 13:39:04 pajoye Exp $ */ /* Define the minimum supported version */ @@ -159,4 +159,4 @@ #endif #define HAVE_STDLIB_H 1 -#define va_copy(ap1, ap2) memcpy(ap1, ap2, sizeof(va_list)) +#define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list)) -- 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/sqlite3/libsqlite sqlite3.c
pajoye Sat Nov 22 13:41:41 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/sqlite3/libsqlite sqlite3.c Log: - Fix windows build please keep the fixes while merging the new versions. if the updates do not contain the fixes, create a little todo list so it is not forgotten (wiki) http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.1.2.9r2=1.1.2.10diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.9 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.10 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.1.2.9 Sat Nov 22 11:05:51 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Sat Nov 22 13:41:21 2008 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ /* @@ -401,16 +401,12 @@ ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as ** the default. */ -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ -defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ -defined(SQLITE_POW2_MEMORY_SIZE)1 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+ defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)1 # error At most one of the following compile-time configuration options\ is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\ SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE #endif -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ -defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ -defined(SQLITE_POW2_MEMORY_SIZE)==0 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)==0 # define SQLITE_SYSTEM_MALLOC 1 #endif @@ -491,7 +487,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -7206,7 +7202,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -7757,7 +7753,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -7988,7 +7984,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -8379,7 +8375,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ #ifndef _PAGER_H_ @@ -8525,7 +8521,7 @@ ** This header file defines the interface that the sqlite page cache ** subsystem. ** -** @(#) $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ #ifndef _PCACHE_H_ @@ -8693,7 +8689,7 @@ ** This header file is #include-ed by sqliteInt.h and thus ends up ** being included by every source file. ** -** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ #ifndef _SQLITE_OS_H_ #define _SQLITE_OS_H_ @@ -8975,7 +8971,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ @@ -11075,7 +11071,7 @@ ** ** This file contains definitions of global variables and contants. ** -** $Id: sqlite3.c,v 1.1.2.9 2008/11/22 11:05:51 scottmac Exp $ +** $Id: sqlite3.c,v 1.1.2.10 2008/11/22 13:41:21 pajoye Exp $ */ @@ -11163,7
[PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite sqlite3.c
pajoye Sat Nov 22 13:46:18 2008 UTC Modified files: /php-src/ext/sqlite3/libsqlite sqlite3.c Log: - MFB: Fix windows build http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/sqlite3.c?r1=1.10r2=1.11diff_format=u Index: php-src/ext/sqlite3/libsqlite/sqlite3.c diff -u php-src/ext/sqlite3/libsqlite/sqlite3.c:1.10 php-src/ext/sqlite3/libsqlite/sqlite3.c:1.11 --- php-src/ext/sqlite3/libsqlite/sqlite3.c:1.10Sat Nov 22 11:04:26 2008 +++ php-src/ext/sqlite3/libsqlite/sqlite3.c Sat Nov 22 13:46:17 2008 @@ -45,7 +45,7 @@ * ** Internal interface definitions for SQLite. ** -** @(#) $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ #ifndef _SQLITEINT_H_ #define _SQLITEINT_H_ @@ -74,7 +74,7 @@ ** ** This file defines various limits of what SQLite can process. ** -** @(#) $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ /* @@ -401,16 +401,12 @@ ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as ** the default. */ -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ -defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ -defined(SQLITE_POW2_MEMORY_SIZE)1 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)1 # error At most one of the following compile-time configuration options\ is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\ SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE #endif -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ -defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ -defined(SQLITE_POW2_MEMORY_SIZE)==0 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)==0 # define SQLITE_SYSTEM_MALLOC 1 #endif @@ -491,7 +487,7 @@ ** the version number) and changes its name to sqlite3.h as ** part of the build process. ** -** @(#) $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ #ifndef _SQLITE3_H_ #define _SQLITE3_H_ @@ -7206,7 +7202,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ @@ -7757,7 +7753,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ #ifndef _BTREE_H_ #define _BTREE_H_ @@ -7988,7 +7984,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ @@ -8379,7 +8375,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ #ifndef _PAGER_H_ @@ -8525,7 +8521,7 @@ ** This header file defines the interface that the sqlite page cache ** subsystem. ** -** @(#) $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** @(#) $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ #ifndef _PCACHE_H_ @@ -8693,7 +8689,7 @@ ** This header file is #include-ed by sqliteInt.h and thus ends up ** being included by every source file. ** -** $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ #ifndef _SQLITE_OS_H_ #define _SQLITE_OS_H_ @@ -8975,7 +8971,7 @@ ** Source files should #include the sqliteInt.h file and let that file ** include this one indirectly. ** -** $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ @@ -11075,7 +11071,7 @@ ** ** This file contains definitions of global variables and contants. ** -** $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ @@ -11163,7 +11159,7 @@ ** This module implements the sqlite3_status() interface and related ** functionality. ** -** $Id: sqlite3.c,v 1.10 2008/11/22 11:04:26 scottmac Exp $ +** $Id: sqlite3.c,v 1.11 2008/11/22 13:46:17 pajoye Exp $ */ /* @@ -11290,7 +11286,7 @@ **
[PHP-CVS] cvs: php-src /ext/spl/tests heap_007.phpt pqueue_003.phpt
davidc Sat Nov 22 14:17:41 2008 UTC Modified files: /php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt Log: - Added tests for bug #46615 (Adjustments) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/heap_007.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/spl/tests/heap_007.phpt diff -u php-src/ext/spl/tests/heap_007.phpt:1.2 php-src/ext/spl/tests/heap_007.phpt:1.3 --- php-src/ext/spl/tests/heap_007.phpt:1.2 Sat May 24 14:12:00 2008 +++ php-src/ext/spl/tests/heap_007.phpt Sat Nov 22 14:17:40 2008 @@ -24,8 +24,8 @@ --EXPECTF-- count($h) = 4 $h-count() = 4 -4=5 -3=4 -2=1 -1=0 +3=5 +2=4 +1=1 +0=0 ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/pqueue_003.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/spl/tests/pqueue_003.phpt diff -u php-src/ext/spl/tests/pqueue_003.phpt:1.2 php-src/ext/spl/tests/pqueue_003.phpt:1.3 --- php-src/ext/spl/tests/pqueue_003.phpt:1.2 Sat May 24 14:12:00 2008 +++ php-src/ext/spl/tests/pqueue_003.phpt Sat Nov 22 14:17:40 2008 @@ -24,8 +24,8 @@ --EXPECTF-- count($h) = 4 $h-count() = 4 -4=5 -3=4 -2=1 -1=0 +3=5 +2=4 +1=1 +0=0 ===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_heap.c
davidc Sat Nov 22 14:18:15 2008 UTC
Modified files:
/php-src/ext/splspl_heap.c
Log:
- Return the key - 1
- Bug #46615
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/spl/spl_heap.c
diff -u php-src/ext/spl/spl_heap.c:1.12 php-src/ext/spl/spl_heap.c:1.13
--- php-src/ext/spl/spl_heap.c:1.12 Mon Nov 17 11:26:24 2008
+++ php-src/ext/spl/spl_heap.c Sat Nov 22 14:18:15 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_heap.c,v 1.12 2008/11/17 11:26:24 felipe Exp $ */
+/* $Id: spl_heap.c,v 1.13 2008/11/22 14:18:15 davidc Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -987,7 +987,7 @@
{
spl_heap_object *intern =
(spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
- RETURN_LONG(intern-heap-count);
+ RETURN_LONG(intern-heap-count - 1);
}
/* }}} */
--
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/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
davidc Sat Nov 22 14:19:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_heap.c
/php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt
Log:
- MFH
- Bug #46615
- Return the count - 1 when invoking SplHeap-key()
- Adjusted the tests
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_heap.c?r1=1.1.2.11r2=1.1.2.12diff_format=u
Index: php-src/ext/spl/spl_heap.c
diff -u php-src/ext/spl/spl_heap.c:1.1.2.11 php-src/ext/spl/spl_heap.c:1.1.2.12
--- php-src/ext/spl/spl_heap.c:1.1.2.11 Mon Nov 17 11:27:59 2008
+++ php-src/ext/spl/spl_heap.c Sat Nov 22 14:19:47 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_heap.c,v 1.1.2.11 2008/11/17 11:27:59 felipe Exp $ */
+/* $Id: spl_heap.c,v 1.1.2.12 2008/11/22 14:19:47 davidc Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -970,8 +970,8 @@
SPL_METHOD(SplHeap, key)
{
spl_heap_object *intern =
(spl_heap_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
-
- RETURN_LONG(intern-heap-count);
+
+ RETURN_LONG(intern-heap-count - 1);
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/heap_007.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/spl/tests/heap_007.phpt
diff -u php-src/ext/spl/tests/heap_007.phpt:1.1.2.3
php-src/ext/spl/tests/heap_007.phpt:1.1.2.4
--- php-src/ext/spl/tests/heap_007.phpt:1.1.2.3 Sat May 24 14:10:44 2008
+++ php-src/ext/spl/tests/heap_007.phpt Sat Nov 22 14:19:47 2008
@@ -12,6 +12,7 @@
$h-rewind();
echo count(\$h) = .count($h).\n;
echo \$h-count() = .$h-count().\n;
+
while ($h-valid()) {
$k = $h-key();
$v = $h-current();
@@ -24,8 +25,8 @@
--EXPECTF--
count($h) = 4
$h-count() = 4
-4=5
-3=4
-2=1
-1=0
+3=5
+2=4
+1=1
+0=0
===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/pqueue_003.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/spl/tests/pqueue_003.phpt
diff -u php-src/ext/spl/tests/pqueue_003.phpt:1.1.2.3
php-src/ext/spl/tests/pqueue_003.phpt:1.1.2.4
--- php-src/ext/spl/tests/pqueue_003.phpt:1.1.2.3 Sat May 24 14:10:44 2008
+++ php-src/ext/spl/tests/pqueue_003.phpt Sat Nov 22 14:19:47 2008
@@ -24,8 +24,8 @@
--EXPECTF--
count($h) = 4
$h-count() = 4
-4=5
-3=4
-2=1
-1=0
+3=5
+2=4
+1=1
+0=0
===DONE===
--
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/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
2008/11/22 David Coallier [EMAIL PROTECTED]: davidc Sat Nov 22 14:19:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/splspl_heap.c /php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt Log: - MFH - Bug #46615 - Return the count - 1 when invoking SplHeap-key() - Adjusted the tests Hmm, shouldn't this have a NEWS entry? -- Kalle Sommer Nielsen -- 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/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
2008/11/22 Kalle Sommer Nielsen [EMAIL PROTECTED]: 2008/11/22 David Coallier [EMAIL PROTECTED]: davidc Sat Nov 22 14:19:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/splspl_heap.c /php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt Log: - MFH - Bug #46615 - Return the count - 1 when invoking SplHeap-key() - Adjusted the tests Hmm, shouldn't this have a NEWS entry? Jaysus give me a second I had to go to the toilet (did you really need to know this?) :D Hehe yes it belongs in the news -- 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_3) / NEWS
davidc Sat Nov 22 14:34:01 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Added news item for bug #46615 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.386r2=1.2027.2.547.2.965.2.387diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.386 php-src/NEWS:1.2027.2.547.2.965.2.387 --- php-src/NEWS:1.2027.2.547.2.965.2.386 Fri Nov 21 20:36:12 2008 +++ php-src/NEWSSat Nov 22 14:34:00 2008 @@ -86,6 +86,8 @@ - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud) - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes, chx1975 at gmail dot com) +- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead + of the key count). (David C.) 02 Sep 2008, PHP 5.3.0 Alpha 2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
davidc Sat Nov 22 14:35:40 2008 UTC Modified files: /php-srcNEWS Log: - Added the fixed bug #46615 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2171r2=1.2172diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2171 php-src/NEWS:1.2172 --- php-src/NEWS:1.2171 Mon Nov 10 14:46:50 2008 +++ php-src/NEWSSat Nov 22 14:35:39 2008 @@ -51,3 +51,5 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead + of the key count). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
hi, only one NEWS entry is required, in the lower branch (in this case, 5.3) Cheers, On Sat, Nov 22, 2008 at 3:35 PM, David Coallier [EMAIL PROTECTED] wrote: davidc Sat Nov 22 14:35:40 2008 UTC Modified files: /php-srcNEWS Log: - Added the fixed bug #46615 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2171r2=1.2172diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2171 php-src/NEWS:1.2172 --- php-src/NEWS:1.2171 Mon Nov 10 14:46:50 2008 +++ php-src/NEWSSat Nov 22 14:35:39 2008 @@ -51,3 +51,5 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead + of the key count). (David C.) -- 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
Re: [PHP-CVS] cvs: php-src / NEWS
On 22.11.2008, at 15:35, David Coallier wrote: davidc Sat Nov 22 14:35:40 2008 UTC Modified files: /php-src NEWS Log: - Added the fixed bug #46615 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2171r2=1.2172diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2171 php-src/NEWS:1.2172 --- php-src/NEWS:1.2171 Mon Nov 10 14:46:50 2008 +++ php-src/NEWSSat Nov 22 14:35:39 2008 @@ -51,3 +51,5 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) +- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead + of the key count). (David C.) only one NEWS file entry per change .. as in the earliest branch that will get released with the change. i have recently updated the README on this point: http://php.net/reST/php-src/README.CVS-RULES regards, Lukas Kahwe Smith [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl interface.c
felipe Sat Nov 22 14:41:21 2008 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
- Fixed segfault [only in this branch, because add_next_* are macro]
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.132r2=1.133diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.132 php-src/ext/curl/interface.c:1.133
--- php-src/ext/curl/interface.c:1.132 Mon Nov 17 11:26:19 2008
+++ php-src/ext/curl/interface.cSat Nov 22 14:41:21 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.132 2008/11/17 11:26:19 felipe Exp $ */
+/* $Id: interface.c,v 1.133 2008/11/22 14:41:21 felipe Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1161,7 +1161,8 @@
array_init(protocol_list);
while (*p != NULL) {
- add_next_index_ascii_string(protocol_list, *p++, 1);
+ add_next_index_ascii_string(protocol_list, *p, 1);
+ *p++;
}
CAAZ(protocols, protocol_list);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS
only one NEWS file entry per change .. as in the earliest branch that will get released with the change. i have recently updated the README on this point: http://php.net/reST/php-src/README.CVS-RULES Ah ok cool I'll remove it. -- Slan, David -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
davidc Sat Nov 22 14:50:01 2008 UTC Modified files: /php-srcNEWS Log: - Removed my duplicate news entry http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2172r2=1.2173diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2172 php-src/NEWS:1.2173 --- php-src/NEWS:1.2172 Sat Nov 22 14:35:39 2008 +++ php-src/NEWSSat Nov 22 14:50:00 2008 @@ -51,5 +51,3 @@ - Added shm_has_var() function. (Mike) - Fixed bug #40325 (Vary: header missing in gzip output handlers). (Mike) -- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead - of the key count). (David C.) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php.h /win32/build config.w32.h.in
scottmacSat Nov 22 15:16:42 2008 UTC Modified files: /php-src/win32/buildconfig.w32.h.in /php-src/main php.h Log: Better fix for va_copy since some architectures like to do a deep copy. http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.19r2=1.20diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.19 php-src/win32/build/config.w32.h.in:1.20 --- php-src/win32/build/config.w32.h.in:1.19Sat Nov 22 13:39:04 2008 +++ php-src/win32/build/config.w32.h.in Sat Nov 22 15:16:42 2008 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.19 2008/11/22 13:39:04 pajoye Exp $ + $Id: config.w32.h.in,v 1.20 2008/11/22 15:16:42 scottmac Exp $ */ /* Define the minimum supported version */ @@ -158,5 +158,3 @@ # define _USE_32BIT_TIME_T 1 #endif #define HAVE_STDLIB_H 1 - -#define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list)) http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.249r2=1.250diff_format=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.249 php-src/main/php.h:1.250 --- php-src/main/php.h:1.249Fri Aug 22 12:59:38 2008 +++ php-src/main/php.h Sat Nov 22 15:16:42 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.249 2008/08/22 12:59:38 helly Exp $ */ +/* $Id: php.h,v 1.250 2008/11/22 15:16:42 scottmac Exp $ */ #ifndef PHP_H #define PHP_H @@ -173,6 +173,14 @@ # endif #endif +#ifndef va_copy +# ifdef __va_copy +# define va_copy(ap1, ap2) __va_copy((ap1), (ap2)) +# else +# define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list)) +# endif +#endif + #include zend_hash.h #include zend_alloc.h #include zend_stack.h -- 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) /main php.h /win32/build config.w32.h.in
scottmacSat Nov 22 15:16:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/win32/buildconfig.w32.h.in /php-src/main php.h Log: MFH Better fix for va_copy since some architectures like to do a deep copy. http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.7.2.4.2.3.2.4r2=1.7.2.4.2.3.2.5diff_format=u Index: php-src/win32/build/config.w32.h.in diff -u php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.4 php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.5 --- php-src/win32/build/config.w32.h.in:1.7.2.4.2.3.2.4 Sat Nov 22 13:34:15 2008 +++ php-src/win32/build/config.w32.h.in Sat Nov 22 15:16:47 2008 @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in,v 1.7.2.4.2.3.2.4 2008/11/22 13:34:15 pajoye Exp $ + $Id: config.w32.h.in,v 1.7.2.4.2.3.2.5 2008/11/22 15:16:47 scottmac Exp $ */ /* Define the minimum supported version */ @@ -159,5 +159,3 @@ # define _USE_32BIT_TIME_T 1 #endif #define HAVE_STDLIB_H 1 - -#define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list)) http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.221.2.4.2.8.2.10r2=1.221.2.4.2.8.2.11diff_format=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.221.2.4.2.8.2.10 php-src/main/php.h:1.221.2.4.2.8.2.11 --- php-src/main/php.h:1.221.2.4.2.8.2.10 Fri Aug 22 12:59:46 2008 +++ php-src/main/php.h Sat Nov 22 15:16:47 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: php.h,v 1.221.2.4.2.8.2.10 2008/08/22 12:59:46 helly Exp $ */ +/* $Id: php.h,v 1.221.2.4.2.8.2.11 2008/11/22 15:16:47 scottmac Exp $ */ #ifndef PHP_H #define PHP_H @@ -173,6 +173,13 @@ # endif #endif +#ifndef va_copy +# ifdef __va_copy +# define va_copy(ap1, ap2) __va_copy((ap1), (ap2)) +# else +# define va_copy(ap1, ap2) memcpy((ap1), (ap2), sizeof(va_list)) +# endif +#endif #include zend_hash.h #include php3_compat.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3/libsqlite php-sqlite3-changes.patch
scottmacSat Nov 22 15:43:34 2008 UTC Added files: /php-src/ext/sqlite3/libsqlite php-sqlite3-changes.patch Log: Patch file for sqlite3 amalgamation so things don't get missed. http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/php-sqlite3-changes.patch?view=markuprev=1.1 Index: php-src/ext/sqlite3/libsqlite/php-sqlite3-changes.patch +++ php-src/ext/sqlite3/libsqlite/php-sqlite3-changes.patch --- sqlite3.c.orig 2008-11-22 15:31:05.0 + +++ sqlite3.c 2008-11-22 15:32:21.0 + @@ -1,3 +1,7 @@ +#if defined(_MSC_VER) _MSC_VER 1300 +#pragma optimize(, off) +#endif + /** ** This file is an amalgamation of many separate C source files from SQLite ** version 3.6.6. By combining all the individual C code files into this @@ -397,16 +401,12 @@ ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as ** the default. */ -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ -defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ -defined(SQLITE_POW2_MEMORY_SIZE)1 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)1 # error At most one of the following compile-time configuration options\ is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\ SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE #endif -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ -defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ -defined(SQLITE_POW2_MEMORY_SIZE)==0 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)==0 # define SQLITE_SYSTEM_MALLOC 1 #endif @@ -98713,3 +98713,7 @@ #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */ /** End of fts3_icu.c / + +#if defined(_MSC_VER) _MSC_VER 1300 +#pragma optimize(, on) +#endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gettext gettext.c
felipe Sat Nov 22 15:44:07 2008 UTC
Modified files:
/php-src/ext/gettextgettext.c
Log:
- Fixed segfault [only in this branch]
http://cvs.php.net/viewvc.cgi/php-src/ext/gettext/gettext.c?r1=1.64r2=1.65diff_format=u
Index: php-src/ext/gettext/gettext.c
diff -u php-src/ext/gettext/gettext.c:1.64 php-src/ext/gettext/gettext.c:1.65
--- php-src/ext/gettext/gettext.c:1.64 Mon Nov 17 11:26:20 2008
+++ php-src/ext/gettext/gettext.c Sat Nov 22 15:44:07 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: gettext.c,v 1.64 2008/11/17 11:26:20 felipe Exp $ */
+/* $Id: gettext.c,v 1.65 2008/11/22 15:44:07 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -253,7 +253,7 @@
PHP_GETTEXT_DOMAIN_LENGTH_CHECK
- if (!domain_len) {
+ if (!domain_len || !*domain_str) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, the first
parameter must not be empty);
RETURN_FALSE;
}
--
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/sqlite3/libsqlite php-sqlite3-changes.patch
scottmacSat Nov 22 15:44:21 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/sqlite3/libsqlite php-sqlite3-changes.patch Log: MFH Patch file for sqlite3 amalgamation so things don't get missed. http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/libsqlite/php-sqlite3-changes.patch?view=markuprev=1.1 Index: php-src/ext/sqlite3/libsqlite/php-sqlite3-changes.patch +++ php-src/ext/sqlite3/libsqlite/php-sqlite3-changes.patch --- sqlite3.c.orig 2008-11-22 15:31:05.0 + +++ sqlite3.c 2008-11-22 15:32:21.0 + @@ -1,3 +1,7 @@ +#if defined(_MSC_VER) _MSC_VER 1300 +#pragma optimize(, off) +#endif + /** ** This file is an amalgamation of many separate C source files from SQLite ** version 3.6.6. By combining all the individual C code files into this @@ -397,16 +401,12 @@ ** If none of the above are defined, then set SQLITE_SYSTEM_MALLOC as ** the default. */ -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ -defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ -defined(SQLITE_POW2_MEMORY_SIZE)1 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)1 # error At most one of the following compile-time configuration options\ is allows: SQLITE_SYSTEM_MALLOC, SQLITE_MEMDEBUG, SQLITE_MEMORY_SIZE,\ SQLITE_MMAP_HEAP_SIZE, SQLITE_POW2_MEMORY_SIZE #endif -#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+\ -defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+\ -defined(SQLITE_POW2_MEMORY_SIZE)==0 +#if defined(SQLITE_SYSTEM_MALLOC)+defined(SQLITE_MEMDEBUG)+defined(SQLITE_MEMORY_SIZE)+defined(SQLITE_MMAP_HEAP_SIZE)+defined(SQLITE_POW2_MEMORY_SIZE)==0 # define SQLITE_SYSTEM_MALLOC 1 #endif @@ -98713,3 +98713,7 @@ #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_FTS3) */ /** End of fts3_icu.c / + +#if defined(_MSC_VER) _MSC_VER 1300 +#pragma optimize(, on) +#endif -- 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/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
2008/11/22 David Coallier [EMAIL PROTECTED]: 2008/11/22 Kalle Sommer Nielsen [EMAIL PROTECTED]: 2008/11/22 David Coallier [EMAIL PROTECTED]: davidc Sat Nov 22 14:19:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/splspl_heap.c /php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt Log: - MFH - Bug #46615 - Return the count - 1 when invoking SplHeap-key() - Adjusted the tests Hmm, shouldn't this have a NEWS entry? Jaysus give me a second I had to go to the toilet (did you really need to know this?) :D hehe Hehe yes it belongs in the news Just so it doesn't be forgotten :) -- Kalle Sommer Nielsen -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/date/tests gmmktime_basic.phpt gmmktime_error.phpt gmmktime_variation1.phpt gmmktime_variation2.phpt gmmktime_variation3.phpt gmmktime_variation4.phpt gmmktime_variatio
On 21.11.2008 09:21, Sanjay Mantoor wrote: smantoor Fri Nov 21 06:21:51 2008 UTC Added files: ... gmmktime_variation9.phpt Sanjay, does this test really work for you? Could you run this code for me, pls? var_dump(gmmktime(8, 8, 8, 12.3456789000e10, 8, 8)); I mean, 123456789000-th month is expected to work alright, but it takes A LOT of time here (Linux 64bit). In fact, the test doesn't seem to finish at all, it runs forever. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /main snprintf.c snprintf.h
Hello Scott,
this does not anything we don't have yet. Your vasprintf does exactly the
same as vspprintf. Also the a in the name typically denotes malloc. In fact
there is a vasprintf on several systems which would collide:
ASPRINTF(3)Linux Programmer's Manual ASPRINTF(3)
NAME
asprintf, vasprintf - print to allocated string
SYNOPSIS
#define _GNU_SOURCE
#include stdio.h
int asprintf(char **strp, const char *fmt, ...);
int vasprintf(char **strp, const char *fmt, va_list ap);
DESCRIPTION
The functions asprintf() and vasprintf() are analogues of sprintf() and
vsprintf(), except that they allocate a string large enough to hold the
output including the terminating null byte, and return a pointer to it
via the first parameter. This pointer should be passed to free(3) to
release the allocated storage when it is no longer needed.
RETURN VALUE
When successful, these functions return the number of bytes printed,
just like sprintf(3). If memory allocation wasn't possible, or some
other error occurs, these functions will return -1, and the contents of
strp is undefined.
CONFORMING TO
These functions are GNU extensions, not in C or POSIX. They are also
available under *BSD. The FreeBSD implementation sets strp to NULL on
error.
SEE ALSO
free(3), malloc(3), printf(3), feature_test_macros(7)
GNU 2001-12-18 ASPRINTF(3)
Thus the proper action is to turn this into malloc rather than emalloc.
Also provide asprintf and add the missing checks for the two library
functions in config.m4, probably in configure.in's AC_CHECK_FUNCS block.
marcus
Friday, November 21, 2008, 10:49:52 PM, you wrote:
scottmacFri Nov 21 21:49:52 2008 UTC
Modified files:
/php-src/main snprintf.c snprintf.h
Log:
Add vasprintf() so the buffer can be automatically calculated, you
need to efree this when done though!
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.c?r1=1.64r2=1.65diff_format=u
Index: php-src/main/snprintf.c
diff -u php-src/main/snprintf.c:1.64 php-src/main/snprintf.c:1.65
--- php-src/main/snprintf.c:1.64Mon Sep 15 11:47:27 2008
+++ php-src/main/snprintf.c Fri Nov 21 21:49:52 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: snprintf.c,v 1.64 2008/09/15 11:47:27 dmitry Exp $ */
+/* $Id: snprintf.c,v 1.65 2008/11/21 21:49:52 scottmac Exp $ */
#include php.h
@@ -1315,6 +1315,30 @@
}
/* }}} */
+PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap) /*
{{{ */
+{
+ va_list ap2;
+ int cc;
+
+ va_copy(ap2, ap);
+ cc = ap_php_vsnprintf(NULL, 0, format, ap2);
+ va_end(ap2);
+
+ *buf = NULL;
+
+ if (cc = 0) {
+ if ((*buf = emalloc(++cc)) != NULL) {
+ if ((cc = ap_php_vsnprintf(*buf, cc, format, ap))
0) {
+ efree(*buf);
+ *buf = NULL;
+ }
+ }
+ }
+
+ return cc;
+}
+/* }}} */
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/main/snprintf.h?r1=1.42r2=1.43diff_format=u
Index: php-src/main/snprintf.h
diff -u php-src/main/snprintf.h:1.42 php-src/main/snprintf.h:1.43
--- php-src/main/snprintf.h:1.42Thu Feb 7 12:45:42 2008
+++ php-src/main/snprintf.h Fri Nov 21 21:49:52 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: snprintf.h,v 1.42 2008/02/07 12:45:42 helly Exp $ */
+/* $Id: snprintf.h,v 1.43 2008/11/21 21:49:52 scottmac Exp $ */
/*
@@ -82,6 +82,7 @@
PHPAPI int ap_php_vslprintf(char *buf, size_t len, const char *format,
va_list ap);
PHPAPI int ap_php_snprintf(char *, size_t, const char *, ...);
PHPAPI int ap_php_vsnprintf(char *, size_t, const char *, va_list ap);
+PHPAPI int ap_php_vasprintf(char **buf, const char *format, va_list ap);
PHPAPI int php_sprintf (char* s, const char* format, ...)
PHP_ATTRIBUTE_FORMAT(printf, 2, 3);
PHPAPI char * php_gcvt(double value, int ndigit, char dec_point, char
exponent, char *buf);
PHPAPI char * php_conv_fp(register char format, register double num,
@@ -109,6 +110,11 @@
#endif
#define vsnprintf ap_php_vsnprintf
+#ifdef vasprintf
+#undef vasprintf
+#endif
+#define vasprintf ap_php_vasprintf
+
#ifdef sprintf
#undef sprintf
#endif
Best regards,
Marcus
--
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/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
Hello Kalle, Saturday, November 22, 2008, 3:25:05 PM, you wrote: 2008/11/22 David Coallier [EMAIL PROTECTED]: davidc Sat Nov 22 14:19:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/splspl_heap.c /php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt Log: - MFH - Bug #46615 - Return the count - 1 when invoking SplHeap-key() - Adjusted the tests Hmm, shouldn't this have a NEWS entry? Since when do we add NEWS entries that fix stuff that was never released? David, please revert that entry. Otherwise it is hard to drop those entries prior to releasing. Best regards, Marcus -- 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) / NEWS
davidc Sat Nov 22 22:54:18 2008 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Removed the unreleased-fix-feature entry as per Marcus's request - Made sure to include my PDO fix in the proper 5.3 release http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.387r2=1.2027.2.547.2.965.2.388diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.387 php-src/NEWS:1.2027.2.547.2.965.2.388 --- php-src/NEWS:1.2027.2.547.2.965.2.387 Sat Nov 22 14:34:00 2008 +++ php-src/NEWSSat Nov 22 22:54:17 2008 @@ -86,8 +86,10 @@ - Fixed bug #44575 (parse_ini_file comment # line problems). (Arnaud) - Fixed bug #44135 (PDO MySQL does not support CLIENT_FOUND_ROWS). (Johannes, chx1975 at gmail dot com) -- Fixed bug #46615 (Make SplHeap-key() returns the key count -1 instead - of the key count). (David C.) +- Fixed bug #44153 (pdo-errorCode() returns NULL when there are no errors). + (David C.) +- Fixed bug #44154 (pdo-errorInfo() always have three elements in the + returned array). (David C.) 02 Sep 2008, PHP 5.3.0 Alpha 2 @@ -3594,7 +3596,3 @@ - Fixed bug #28694 (ReflectionExtension::getFunctions() crashes PHP). (Marcus) - Fixed bug #28512 (Allocate enough space to store MSSQL data). (Frank) - Fixed strip_tags() to correctly handle '\0' characters. (Stefan) -- Fixed bug #44153 (pdo-errorCode() returns NULL when there are no errors). - (David C.) -- Fixed bug #44154 (pdo-errorInfo() always have three elements in the - returned array). (David C.) -- 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/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
Hmm, shouldn't this have a NEWS entry? Since when do we add NEWS entries that fix stuff that was never released? David, please revert that entry. Otherwise it is hard to drop those entries prior to releasing. Done. -- Slan, David -- 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/spl spl_heap.c /ext/spl/tests heap_007.phpt pqueue_003.phpt
On Sat, Nov 22, 2008 at 11:48 PM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Kalle, Saturday, November 22, 2008, 3:25:05 PM, you wrote: 2008/11/22 David Coallier [EMAIL PROTECTED]: davidc Sat Nov 22 14:19:47 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/splspl_heap.c /php-src/ext/spl/tests heap_007.phpt pqueue_003.phpt Log: - MFH - Bug #46615 - Return the count - 1 when invoking SplHeap-key() - Adjusted the tests Hmm, shouldn't this have a NEWS entry? Since when do we add NEWS entries that fix stuff that was never released? We do add stuff that has been fixed between two releases, even RC or alpha. These entries are then merged into a single one before the final release. See the release howto in the wiki. Cheers, -- 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] cvs: php-src /ext/mysqlnd php_mysqlnd.c
pajoye Sat Nov 22 23:52:40 2008 UTC
Modified files:
/php-src/ext/mysqlndphp_mysqlnd.c
Log:
- declaration first (fix build win)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/php_mysqlnd.c?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/mysqlnd/php_mysqlnd.c
diff -u php-src/ext/mysqlnd/php_mysqlnd.c:1.9
php-src/ext/mysqlnd/php_mysqlnd.c:1.10
--- php-src/ext/mysqlnd/php_mysqlnd.c:1.9 Fri Oct 31 20:30:33 2008
+++ php-src/ext/mysqlnd/php_mysqlnd.c Sat Nov 22 23:52:40 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_mysqlnd.c,v 1.9 2008/10/31 20:30:33 andrey Exp $ */
+/* $Id: php_mysqlnd.c,v 1.10 2008/11/22 23:52:40 pajoye Exp $ */
#include php.h
#include php_ini.h
#include mysqlnd.h
@@ -46,13 +46,14 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), pos_values);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values),
-
(void **)values_entry, pos_values) == SUCCESS) {
- TSRMLS_FETCH();
+ (void **)values_entry, pos_values) == SUCCESS) {
zstrstring_key;
uintstring_key_len;
ulong num_key;
char*s = NULL;
+ TSRMLS_FETCH();
+
zend_hash_get_current_key_ex(Z_ARRVAL_P(values), string_key,
string_key_len, num_key, 0, pos_values);
convert_to_string(*values_entry);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
