[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Sep 13 01:31:22 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2806r2=1.2807diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2806 php-src/ChangeLog:1.2807 --- php-src/ChangeLog:1.2806Wed Sep 12 01:31:14 2007 +++ php-src/ChangeLog Thu Sep 13 01:31:21 2007 @@ -1,3 +1,89 @@ +2007-09-12 Stanislav Malyshev [EMAIL PROTECTED] + +* ext/pdo/pdo_stmt.c: + MFB: fix crash if stream is empty and reader function sets buffer as null + +* (PHP_5_2) + ext/pdo/pdo_stmt.c: + fix crash if stream is empty and reader function sets buffer as null + +2007-09-12 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/pdo/pdo_dbh.c: + Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT). + +2007-09-12 Nuno Lopes [EMAIL PROTECTED] + +* ext/standard/proc_open.c: + MFB: fix #39651 + +2007-09-12 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + reorder + +* (PHP_5_2) + NEWS: + BFN + +2007-09-12 Nuno Lopes [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN #39651 + +2007-09-12 Jani Taskinen [EMAIL PROTECTED] + +* ext/bz2/php_bz2.h: + - Fixed bug #42627 (bz2 extension fails to build with -fno-common) + +2007-09-12 Nuno Lopes [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/proc_open.c: + fix bug #39651: proc_open() append mode doesnt work on windows + +2007-09-12 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/file/readlink_realpath_basic1.phpt + ext/standard/tests/file/readlink_realpath_basic1.phpt + ext/standard/tests/file/readlink_realpath_variation1.phpt + ext/standard/tests/file/readlink_realpath_variation1.phpt + ext/standard/tests/file/readlink_realpath_variation2.phpt + ext/standard/tests/file/readlink_realpath_variation2.phpt: + marked with Bug #42038 + +2007-09-12 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + fix news + +2007-09-12 Andrey Hristov [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/mysqli/mysqli.c + ext/mysqli/php_mysqli.h: + Fix stupid error, which happens only on Windows. And we thought this has + been fixed. Now my_thread_end() should be called and there should be no + warnings in the error logs of exiting thread, which hasn't deinited, and + leaks. + +2007-09-12 Raghubansh Kumar [EMAIL PROTECTED] + +* ext/standard/tests/file/is_file_variation4.phpt + ext/standard/tests/file/rename_variation.phpt: + marked with bug#42638 + +* (PHP_5_2) + ext/standard/tests/file/is_file_variation4.phpt + ext/standard/tests/file/rename_variation.phpt: + marked with Bug# 42638 + 2007-09-11 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/libgd/gd.h:
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file is_file_variation4.phpt rename_variation.phpt
kraghubaWed Sep 12 08:27:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/fileis_file_variation4.phpt
rename_variation.phpt
Log:
marked with Bug# 42638
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_variation4.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/standard/tests/file/is_file_variation4.phpt
diff -u php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.4
php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.5
--- php-src/ext/standard/tests/file/is_file_variation4.phpt:1.1.2.4 Mon Jul
23 10:47:13 2007
+++ php-src/ext/standard/tests/file/is_file_variation4.phpt Wed Sep 12
08:27:35 2007
@@ -1,5 +1,5 @@
--TEST--
-Test is_file() function: usage variations - diff. path notations (Bug #42027)
+Test is_file() function: usage variations - diff. path notations (Bug #42027,
#42638)
--FILE--
?php
/* Prototype: bool is_file ( string $filename );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation.phpt
diff -u php-src/ext/standard/tests/file/rename_variation.phpt:1.1.2.2
php-src/ext/standard/tests/file/rename_variation.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/rename_variation.phpt:1.1.2.2 Fri Jun
29 12:56:49 2007
+++ php-src/ext/standard/tests/file/rename_variation.phpt Wed Sep 12
08:27:35 2007
@@ -1,5 +1,5 @@
--TEST--
-Test rename() function: usage variations-1
+Test rename() function: usage variations-1 (Bug#42638)
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file is_file_variation4.phpt rename_variation.phpt
kraghubaWed Sep 12 08:29:34 2007 UTC
Modified files:
/php-src/ext/standard/tests/fileis_file_variation4.phpt
rename_variation.phpt
Log:
marked with bug#42638
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/is_file_variation4.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/is_file_variation4.phpt
diff -u php-src/ext/standard/tests/file/is_file_variation4.phpt:1.3
php-src/ext/standard/tests/file/is_file_variation4.phpt:1.4
--- php-src/ext/standard/tests/file/is_file_variation4.phpt:1.3 Mon Jul 23
10:45:53 2007
+++ php-src/ext/standard/tests/file/is_file_variation4.phpt Wed Sep 12
08:29:34 2007
@@ -1,5 +1,5 @@
--TEST--
-Test is_file() function: usage variations - diff. path notations (Bug #42027)
+Test is_file() function: usage variations - diff. path notations (Bug #42027,
#42638)
--FILE--
?php
/* Prototype: bool is_file ( string $filename );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/rename_variation.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/file/rename_variation.phpt
diff -u php-src/ext/standard/tests/file/rename_variation.phpt:1.3
php-src/ext/standard/tests/file/rename_variation.phpt:1.4
--- php-src/ext/standard/tests/file/rename_variation.phpt:1.3 Fri Jun 29
12:54:06 2007
+++ php-src/ext/standard/tests/file/rename_variation.phpt Wed Sep 12
08:29:34 2007
@@ -1,5 +1,5 @@
--TEST--
-Test rename() function: usage variations-1
+Test rename() function: usage variations-1 (Bug#42638)
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
--
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/mysqli mysqli.c php_mysqli.h
andrey Wed Sep 12 09:12:56 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/mysqli mysqli.c php_mysqli.h
Log:
Fix stupid error, which happens only on Windows. And we thought this has
been fixed. Now my_thread_end() should be called and there should be no
warnings in the error logs of exiting thread, which hasn't deinited, and
leaks.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.941r2=1.2027.2.547.2.942diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.941 php-src/NEWS:1.2027.2.547.2.942
--- php-src/NEWS:1.2027.2.547.2.941 Tue Sep 11 21:03:47 2007
+++ php-src/NEWSWed Sep 12 09:12:55 2007
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 20??, PHP 5.2.5
+- Fixed missing brackets leading to build warning and error in the log.
+ Win32 code). (Andrey)
- Fixed leaks with mulitple connects on one mysqli object. (Andrey)
- Fixed endianness detection on MacOS when building universal binary.
(Uwe Schindler, Christian Speich, Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.16.2.16r2=1.72.2.16.2.17diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.16.2.16
php-src/ext/mysqli/mysqli.c:1.72.2.16.2.17
--- php-src/ext/mysqli/mysqli.c:1.72.2.16.2.16 Mon Jun 25 16:01:30 2007
+++ php-src/ext/mysqli/mysqli.c Wed Sep 12 09:12:56 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.16.2.16 2007/06/25 16:01:30 scottmac Exp $
+ $Id: mysqli.c,v 1.72.2.16.2.17 2007/09/12 09:12:56 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -665,7 +665,7 @@
PHP_MSHUTDOWN_FUNCTION(mysqli)
{
#ifdef PHP_WIN32
- unsigned long client_ver = mysql_get_client_version;
+ unsigned long client_ver = mysql_get_client_version();
/* Can't call mysql_server_end() multiple times prior to 5.0.42 on
Windows */
if ((client_ver 50042 client_ver 50100) || client_ver 50122) {
mysql_server_end();
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli.h?r1=1.54.2.7.2.5r2=1.54.2.7.2.6diff_format=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.5
php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.6
--- php-src/ext/mysqli/php_mysqli.h:1.54.2.7.2.5Sat Feb 24 14:33:50 2007
+++ php-src/ext/mysqli/php_mysqli.h Wed Sep 12 09:12:56 2007
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.54.2.7.2.5 2007/02/24 14:33:50 helly Exp $
+ $Id: php_mysqli.h,v 1.54.2.7.2.6 2007/09/12 09:12:56 andrey Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -241,9 +241,10 @@
#define MYSQLI_RETURN_LONG_LONG(__val) \
{ \
if ((__val) LONG_MAX) { \
- RETURN_LONG((__val)); \
+ RETURN_LONG((long) (__val));\
} else {\
char *ret; \
+ /* always used with my_ulonglong - %llu */ \
int l = spprintf(ret, 0, %llu, (__val)); \
RETURN_STRINGL(ret, l, 0); \
} \
--
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/standard/tests/file readlink_realpath_basic1.phpt readlink_realpath_variation1.phpt readlink_realpath_variation2.phpt
kraghubaWed Sep 12 09:47:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filereadlink_realpath_variation1.phpt
readlink_realpath_variation2.phpt
readlink_realpath_basic1.phpt
Log:
marked with Bug #42038
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt
diff -u
php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt:1.1.2.1
php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt:1.1.2.1
Mon Jul 9 17:38:33 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt Wed Sep
12 09:47:35 2007
@@ -1,5 +1,5 @@
--TEST--
-Test readlink() and realpath() functions: usage variation - linkname/filename
stored in object
+Test readlink() and realpath() functions: usage variation - linkname/filename
stored in object(Bug #42038)
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt
diff -u
php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt:1.1.2.1
php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt:1.1.2.1
Mon Jul 9 17:38:33 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt Wed Sep
12 09:47:35 2007
@@ -1,5 +1,5 @@
--TEST--
-Test readlink() and realpath() functions: usage variation - linkname/filename
stored in array
+Test readlink() and realpath() functions: usage variation - linkname/filename
stored in array(Bug #42038)
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt
diff -u php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.1
php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.1.2.1
Mon Jul 9 17:38:33 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt Wed Sep
12 09:47:35 2007
@@ -1,5 +1,5 @@
--TEST--
-Test readlink() and realpath functions: basic functionality - diff. path
notation for links
+Test readlink() and realpath functions: basic functionality - diff. path
notation for links(Bug #42038)
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
--
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
janiWed Sep 12 09:49:20 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: fix news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.942r2=1.2027.2.547.2.943diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.942 php-src/NEWS:1.2027.2.547.2.943 --- php-src/NEWS:1.2027.2.547.2.942 Wed Sep 12 09:12:55 2007 +++ php-src/NEWSWed Sep 12 09:49:20 2007 @@ -7,13 +7,13 @@ - Fixed endianness detection on MacOS when building universal binary. (Uwe Schindler, Christian Speich, Tony) - Fixed possible triggering of buffer overflows inside glibc - imlplementations of the fnmatch(), setlocale() and glob() functions reported - by Laurent gaffie (Ilia) + imlplementations of the fnmatch(), setlocale() and glob() functions. + Reported by Laurent gaffie. (Ilia) - Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre) - Upgraded PCRE to version 7.3 (Nuno) - Added optional parameter $provide_object to debug_backtrace(). (Sebastian) -- Added alpha support for imagefilter's IMG_FILTER_COLORIZE +- Added alpha support for imagefilter() IMG_FILTER_COLORIZE. (Pierre) - Fixed Bug #42596 (session.save_path MODE option does not work). (Ilia) - Fixed bug #42590 (Make the engine recornize \v and \f escape sequences). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file readlink_realpath_basic1.phpt readlink_realpath_variation1.phpt readlink_realpath_variation2.phpt
kraghubaWed Sep 12 09:49:25 2007 UTC
Modified files:
/php-src/ext/standard/tests/filereadlink_realpath_variation1.phpt
readlink_realpath_variation2.phpt
readlink_realpath_basic1.phpt
Log:
marked with Bug #42038
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt
diff -u php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt:1.2
php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt:1.3
--- php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt:1.2
Mon Jul 9 17:40:16 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_variation1.phpt Wed Sep
12 09:49:25 2007
@@ -1,5 +1,5 @@
--TEST--
-Test readlink() and realpath() functions: usage variation - linkname/filename
stored in object
+Test readlink() and realpath() functions: usage variation - linkname/filename
stored in object(Bug #42038)
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt
diff -u php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt:1.2
php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt:1.3
--- php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt:1.2
Mon Jul 9 17:40:16 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_variation2.phpt Wed Sep
12 09:49:25 2007
@@ -1,5 +1,5 @@
--TEST--
-Test readlink() and realpath() functions: usage variation - linkname/filename
stored in array
+Test readlink() and realpath() functions: usage variation - linkname/filename
stored in array(Bug #42038)
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt
diff -u php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.2
php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.3
--- php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt:1.2 Mon Jul
9 17:40:16 2007
+++ php-src/ext/standard/tests/file/readlink_realpath_basic1.phpt Wed Sep
12 09:49:25 2007
@@ -1,5 +1,5 @@
--TEST--
-Test readlink() and realpath functions: basic functionality - diff. path
notation for links
+Test readlink() and realpath functions: basic functionality - diff. path
notation for links(Bug #42038)
--SKIPIF--
?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
--
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/standard proc_open.c
nlopess Wed Sep 12 11:42:43 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard proc_open.c
Log:
fix bug #39651: proc_open() append mode doesnt work on windows
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.16r2=1.36.2.1.2.17diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.16
php-src/ext/standard/proc_open.c:1.36.2.1.2.17
--- php-src/ext/standard/proc_open.c:1.36.2.1.2.16 Fri Aug 17 10:42:30 2007
+++ php-src/ext/standard/proc_open.cWed Sep 12 11:42:43 2007
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: proc_open.c,v 1.36.2.1.2.16 2007/08/17 10:42:30 jani Exp $ */
+/* $Id: proc_open.c,v 1.36.2.1.2.17 2007/09/12 11:42:43 nlopess Exp $ */
#if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -677,6 +677,12 @@
#ifdef PHP_WIN32
descriptors[ndesc].childend =
dup_fd_as_handle(fd);
_close(fd);
+
+ /* simulate the append mode by fseeking to the
end of the file
+ this introduces a potential race-condition, but
it is the best we can do, though */
+ if (strchr(Z_STRVAL_PP(zmode), 'a')) {
+
SetFilePointer(descriptors[ndesc].childend, 0, NULL, FILE_END);
+ }
#else
descriptors[ndesc].childend = fd;
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/bz2 php_bz2.h
janiWed Sep 12 11:44:11 2007 UTC Modified files: /php-src/ext/bz2php_bz2.h Log: - Fixed bug #42627 (bz2 extension fails to build with -fno-common) http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/php_bz2.h?r1=1.11r2=1.12diff_format=u Index: php-src/ext/bz2/php_bz2.h diff -u php-src/ext/bz2/php_bz2.h:1.11 php-src/ext/bz2/php_bz2.h:1.12 --- php-src/ext/bz2/php_bz2.h:1.11 Mon Jan 1 09:29:21 2007 +++ php-src/ext/bz2/php_bz2.h Wed Sep 12 11:44:11 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_bz2.h,v 1.11 2007/01/01 09:29:21 sebastian Exp $ */ +/* $Id: php_bz2.h,v 1.12 2007/09/12 11:44:11 jani Exp $ */ #ifndef PHP_BZ2_H #define PHP_BZ2_H @@ -51,7 +51,7 @@ #define php_stream_bz2open_from_BZFILE(bz, mode, innerstream) _php_stream_bz2open_from_BZFILE((bz), (mode), (innerstream) STREAMS_CC TSRMLS_CC) #define php_stream_bz2open(wrapper, path, mode, options, opened_path) _php_stream_bz2open((wrapper), (path), (mode), (options), (opened_path), NULL STREAMS_CC TSRMLS_CC) -php_stream_filter_factory php_bz2_filter_factory; +extern php_stream_filter_factory php_bz2_filter_factory; extern php_stream_ops php_stream_bz2io_ops; #define PHP_STREAM_IS_BZIP2php_stream_bz2io_ops -- 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/bz2 php_bz2.h
janiWed Sep 12 11:44:25 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/bz2php_bz2.h Log: MFH:- Fixed bug #42627 (bz2 extension fails to build with -fno-common) http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/php_bz2.h?r1=1.7.2.1.2.3r2=1.7.2.1.2.4diff_format=u Index: php-src/ext/bz2/php_bz2.h diff -u php-src/ext/bz2/php_bz2.h:1.7.2.1.2.3 php-src/ext/bz2/php_bz2.h:1.7.2.1.2.4 --- php-src/ext/bz2/php_bz2.h:1.7.2.1.2.3 Mon Jan 1 09:35:48 2007 +++ php-src/ext/bz2/php_bz2.h Wed Sep 12 11:44:25 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_bz2.h,v 1.7.2.1.2.3 2007/01/01 09:35:48 sebastian Exp $ */ +/* $Id: php_bz2.h,v 1.7.2.1.2.4 2007/09/12 11:44:25 jani Exp $ */ #ifndef PHP_BZ2_H #define PHP_BZ2_H @@ -51,7 +51,7 @@ #define php_stream_bz2open_from_BZFILE(bz, mode, innerstream) _php_stream_bz2open_from_BZFILE((bz), (mode), (innerstream) STREAMS_CC TSRMLS_CC) #define php_stream_bz2open(wrapper, path, mode, options, opened_path) _php_stream_bz2open((wrapper), (path), (mode), (options), (opened_path), NULL STREAMS_CC TSRMLS_CC) -php_stream_filter_factory php_bz2_filter_factory; +extern php_stream_filter_factory php_bz2_filter_factory; extern php_stream_ops php_stream_bz2io_ops; #define PHP_STREAM_IS_BZIP2php_stream_bz2io_ops -- 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
nlopess Wed Sep 12 11:44:25 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN #39651 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.943r2=1.2027.2.547.2.944diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.943 php-src/NEWS:1.2027.2.547.2.944 --- php-src/NEWS:1.2027.2.547.2.943 Wed Sep 12 09:49:20 2007 +++ php-src/NEWSWed Sep 12 11:44:25 2007 @@ -1,4 +1,4 @@ -PHPNEWS +PHP NEWS ||| ?? ??? 20??, PHP 5.2.5 - Fixed missing brackets leading to build warning and error in the log. @@ -44,6 +44,7 @@ compliant wsdl). (Dmitry) - Fixed bug #41561 (Values set with php_admin_* in httpd.conf can be overwritten with ini_set()). (Stas, Jani) +- Fixed bug #39651 (proc_open() append mode doesn't work on windows). (Nuno) 30 Aug 2007, PHP 5.2.4 - Removed --enable-versioning configure option. (Jani) -- 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/pdo pdo_dbh.c
iliaa Wed Sep 12 18:26:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/pdopdo_dbh.c
Log:
Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.946r2=1.2027.2.547.2.947diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.946 php-src/NEWS:1.2027.2.547.2.947
--- php-src/NEWS:1.2027.2.547.2.946 Wed Sep 12 11:46:02 2007
+++ php-src/NEWSWed Sep 12 18:26:48 2007
@@ -15,6 +15,7 @@
Reported by Laurent gaffie. (Ilia)
- Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre)
+- Fixed bug #42643 (CLI segfaults if using ATTR_PERSISTENT). (Ilia)
- Fixed bug #42627 (bz2 extension fails to build with -fno-common).
(dolecek at netbsd dot org)
- Fixed Bug #42596 (session.save_path MODE option does not work). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.16r2=1.82.2.31.2.17diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.16
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.16Thu Aug 30 14:06:12 2007
+++ php-src/ext/pdo/pdo_dbh.c Wed Sep 12 18:26:49 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.16 2007/08/30 14:06:12 bjori Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17 2007/09/12 18:26:49 iliaa Exp $ */
/* The PDO Database Handle Class */
@@ -1453,12 +1453,6 @@
}
}
- if (dbh-properties) {
- zend_hash_destroy(dbh-properties);
- efree(dbh-properties);
- dbh-properties = NULL;
- }
-
pefree(dbh, dbh-is_persistent);
}
@@ -1478,6 +1472,12 @@
dbh-methods-rollback(dbh TSRMLS_CC);
dbh-in_txn = 0;
}
+
+ if (dbh-properties) {
+ zend_hash_destroy(dbh-properties);
+ efree(dbh-properties);
+ dbh-properties = NULL;
+ }
if (!dbh-is_persistent) {
dbh_free(dbh TSRMLS_CC);
--
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 pdo_stmt.c
stasWed Sep 12 21:21:18 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdopdo_stmt.c
Log:
fix crash if stream is empty and reader function sets buffer as null
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.23r2=1.118.2.38.2.24diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.23
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.23 Thu Aug 30 14:06:12 2007
+++ php-src/ext/pdo/pdo_stmt.c Wed Sep 12 21:21:18 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.23 2007/08/30 14:06:12 bjori Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24 2007/09/12 21:21:18 stas Exp $ */
/* The PDO Statement Handle Class */
@@ -569,7 +569,11 @@
char *buf = NULL;
size_t len;
len =
php_stream_copy_to_mem((php_stream*)value, buf, PHP_STREAM_COPY_ALL, 0);
- ZVAL_STRINGL(dest, buf, len, 0);
+ if(buf == NULL) {
+ ZVAL_EMPTY_STRING(dest);
+ } else {
+ ZVAL_STRINGL(dest, buf, len, 0);
+ }
php_stream_close((php_stream*)value);
} else {
php_stream_to_zval((php_stream*)value,
dest);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo pdo_stmt.c
stasWed Sep 12 21:27:57 2007 UTC
Modified files:
/php-src/ext/pdopdo_stmt.c
Log:
MFB: fix crash if stream is empty and reader function sets buffer as null
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.175r2=1.176diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.175 php-src/ext/pdo/pdo_stmt.c:1.176
--- php-src/ext/pdo/pdo_stmt.c:1.175Wed May 16 20:12:53 2007
+++ php-src/ext/pdo/pdo_stmt.c Wed Sep 12 21:27:56 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: pdo_stmt.c,v 1.175 2007/05/16 20:12:53 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.176 2007/09/12 21:27:56 stas Exp $ */
/* The PDO Statement Handle Class */
@@ -538,7 +538,11 @@
char *buf = NULL;
size_t len;
len =
php_stream_copy_to_mem((php_stream*)value, buf, PHP_STREAM_COPY_ALL, 0);
- ZVAL_STRINGL(dest, buf, len, 0);
+ if(buf == NULL) {
+ ZVAL_EMPTY_STRING(dest);
+ } else {
+ ZVAL_STRINGL(dest, buf, len, 0);
+ }
php_stream_close((php_stream*)value);
} else {
php_stream_to_zval((php_stream*)value,
dest);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
andiWed Sep 12 21:57:30 2007 UTC Modified files: /CVSROOTavail Log: - Enable Stas to help with CVS accounts http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1302r2=1.1303diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1302 CVSROOT/avail:1.1303 --- CVSROOT/avail:1.1302Sat Sep 8 01:06:37 2007 +++ CVSROOT/avail Wed Sep 12 21:57:30 2007 @@ -12,7 +12,7 @@ # Some people also have access to the configuration files in the # CVSROOT. -avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip|CVSROOT +avail|sterling,goba,imajes,wez,iliaa,derick,jon,cox,alan_k,jmcastagnetto,mj,pajoye,helly,philip,stas|CVSROOT # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
stasWed Sep 12 21:58:55 2007 UTC Modified files: /CVSROOTavail Log: ICU group access to unicode module http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1303r2=1.1304diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1303 CVSROOT/avail:1.1304 --- CVSROOT/avail:1.1303Wed Sep 12 21:57:30 2007 +++ CVSROOT/avail Wed Sep 12 21:58:55 2007 @@ -282,7 +282,7 @@ avail|tias|pear/PEAR_Frontend_Web,peardoc avail|va|pecl/yami avail|msaraujo,mansion|pecl/lua -avail|merletenney,kirtig,harveyrd|pecl/intl +avail|merletenney,kirtig,harveyrd|pecl/intl,pecl/unicode # php windows installer -- 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/standard dl.c
stasThu Sep 13 00:56:31 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard dl.c
Log:
docs say dl() parameter can be filename only - enforce it
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.106.2.1.2.2r2=1.106.2.1.2.3diff_format=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.106.2.1.2.2
php-src/ext/standard/dl.c:1.106.2.1.2.3
--- php-src/ext/standard/dl.c:1.106.2.1.2.2 Fri Feb 23 00:37:35 2007
+++ php-src/ext/standard/dl.c Thu Sep 13 00:56:31 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.106.2.1.2.2 2007/02/23 00:37:35 iliaa Exp $ */
+/* $Id: dl.c,v 1.106.2.1.2.3 2007/09/13 00:56:31 stas Exp $ */
#include php.h
#include dl.h
@@ -125,6 +125,13 @@
if (extension_dir extension_dir[0]){
int extension_dir_len = strlen(extension_dir);
+ if(type == MODULE_TEMPORARY) {
+ if(strchr(Z_STRVAL_P(file), '/') != NULL ||
strchr(Z_STRVAL_P(file), DEFAULT_SLASH) != NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Temporary module name should contain only filename);
+ RETURN_FALSE;
+ }
+ }
+
if (IS_SLASH(extension_dir[extension_dir_len-1])) {
spprintf(libpath, 0, %s%s, extension_dir,
Z_STRVAL_P(file));
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dl.c
stasThu Sep 13 01:16:24 2007 UTC
Modified files:
/php-src/ext/standard dl.c
Log:
MFB: docs say dl() parameter can be filename only - enforce it
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dl.c?r1=1.114r2=1.115diff_format=u
Index: php-src/ext/standard/dl.c
diff -u php-src/ext/standard/dl.c:1.114 php-src/ext/standard/dl.c:1.115
--- php-src/ext/standard/dl.c:1.114 Tue May 29 21:24:45 2007
+++ php-src/ext/standard/dl.c Thu Sep 13 01:16:24 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dl.c,v 1.114 2007/05/29 21:24:45 tony2001 Exp $ */
+/* $Id: dl.c,v 1.115 2007/09/13 01:16:24 stas Exp $ */
#include php.h
#include dl.h
@@ -115,6 +115,13 @@
if (extension_dir extension_dir[0]){
int extension_dir_len = strlen(extension_dir);
+ if(type == MODULE_TEMPORARY) {
+ if(strchr(filename, '/') != NULL || strchr(filename,
DEFAULT_SLASH) != NULL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Temporary module name should contain only filename);
+ RETURN_FALSE;
+ }
+ }
+
if (IS_SLASH(extension_dir[extension_dir_len-1])) {
spprintf(libpath, 0, %s%s, extension_dir, filename);
/* SAFE */
} else {
--
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
janiWed Sep 12 11:45:35 2007 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.944r2=1.2027.2.547.2.945diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.944 php-src/NEWS:1.2027.2.547.2.945 --- php-src/NEWS:1.2027.2.547.2.944 Wed Sep 12 11:44:25 2007 +++ php-src/NEWSWed Sep 12 11:45:34 2007 @@ -15,6 +15,8 @@ - Added optional parameter $provide_object to debug_backtrace(). (Sebastian) - Added alpha support for imagefilter() IMG_FILTER_COLORIZE. (Pierre) +- Fixed bug #42627 (bz2 extension fails to build with -fno-common). + (dolecek at netbsd dot org) - Fixed Bug #42596 (session.save_path MODE option does not work). (Ilia) - Fixed bug #42590 (Make the engine recornize \v and \f escape sequences). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c
nlopess Wed Sep 12 11:46:08 2007 UTC
Modified files:
/php-src/ext/standard proc_open.c
Log:
MFB: fix #39651
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.58r2=1.59diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.58
php-src/ext/standard/proc_open.c:1.59
--- php-src/ext/standard/proc_open.c:1.58 Fri Aug 17 10:42:12 2007
+++ php-src/ext/standard/proc_open.cWed Sep 12 11:46:08 2007
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: proc_open.c,v 1.58 2007/08/17 10:42:12 jani Exp $ */
+/* $Id: proc_open.c,v 1.59 2007/09/12 11:46:08 nlopess Exp $ */
#if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -669,6 +669,12 @@
#ifdef PHP_WIN32
descriptors[ndesc].childend =
dup_fd_as_handle(fd);
_close(fd);
+
+ /* simulate the append mode by fseeking to the
end of the file
+ this introduces a potential race-condition, but
it is the best we can do, though */
+ if (strchr(Z_STRVAL_PP(zmode), 'a')) {
+
SetFilePointer(descriptors[ndesc].childend, 0, NULL, FILE_END);
+ }
#else
descriptors[ndesc].childend = fd;
#endif
--
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
janiWed Sep 12 11:46:03 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: reorder http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.945r2=1.2027.2.547.2.946diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.945 php-src/NEWS:1.2027.2.547.2.946 --- php-src/NEWS:1.2027.2.547.2.945 Wed Sep 12 11:45:34 2007 +++ php-src/NEWSWed Sep 12 11:46:02 2007 @@ -1,6 +1,10 @@ PHP NEWS ||| ?? ??? 20??, PHP 5.2.5 +- Upgraded PCRE to version 7.3 (Nuno) +- Added optional parameter $provide_object to debug_backtrace(). (Sebastian) +- Added alpha support for imagefilter() IMG_FILTER_COLORIZE. (Pierre) + - Fixed missing brackets leading to build warning and error in the log. Win32 code). (Andrey) - Fixed leaks with mulitple connects on one mysqli object. (Andrey) @@ -11,10 +15,6 @@ Reported by Laurent gaffie. (Ilia) - Fixed imagerectangle regression with 1x1 rectangle (libgd #106). (Pierre) -- Upgraded PCRE to version 7.3 (Nuno) -- Added optional parameter $provide_object to debug_backtrace(). (Sebastian) -- Added alpha support for imagefilter() IMG_FILTER_COLORIZE. (Pierre) - - Fixed bug #42627 (bz2 extension fails to build with -fno-common). (dolecek at netbsd dot org) - Fixed Bug #42596 (session.save_path MODE option does not work). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
