[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
iliaa Thu Aug 24 15:07:57 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.571r2=1.2027.2.572diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.571 php-src/NEWS:1.2027.2.572 --- php-src/NEWS:1.2027.2.571 Wed Aug 23 13:17:36 2006 +++ php-src/NEWSThu Aug 24 15:07:56 2006 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2006, PHP 5.1.7 + 24 Aug 2006, PHP 5.1.6 - Fixed memory_limit on 64bit systems. (Stefan E.) - Fixed bug #38488 (Access to php://stdin and family crashes PHP on win32). http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.56r2=1.579.2.57diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.56 php-src/configure.in:1.579.2.57 --- php-src/configure.in:1.579.2.56 Wed Aug 23 13:17:36 2006 +++ php-src/configure.inThu Aug 24 15:07:56 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.56 2006/08/23 13:17:36 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.57 2006/08/24 15:07:56 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,8 +41,8 @@ MAJOR_VERSION=5 MINOR_VERSION=1 -RELEASE_VERSION=6 -EXTRA_VERSION= +RELEASE_VERSION=7 +EXTRA_VERSION=-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.41r2=1.112.2.42diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.41 php-src/main/php_version.h:1.112.2.42 --- php-src/main/php_version.h:1.112.2.41 Wed Aug 23 13:17:36 2006 +++ php-src/main/php_version.h Thu Aug 24 15:07:57 2006 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 6 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.1.6 +#define PHP_RELEASE_VERSION 7 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.1.7-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
iliaa Wed Aug 23 13:17:36 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.1.6 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.570r2=1.2027.2.571diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.570 php-src/NEWS:1.2027.2.571 --- php-src/NEWS:1.2027.2.570 Tue Aug 22 06:16:19 2006 +++ php-src/NEWSWed Aug 23 13:17:36 2006 @@ -1,11 +1,11 @@ PHPNEWS ||| -?? ??? 2006, PHP 5.1.6 +24 Aug 2006, PHP 5.1.6 +- Fixed memory_limit on 64bit systems. (Stefan E.) - Fixed bug #38488 (Access to php://stdin and family crashes PHP on win32). (Dmitry) 17 Aug 2006, PHP 5.1.5 -- Fixed memory_limit on 64bit systems. (Stefan E.) - Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.) - Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or safe_mode are enabled. (Stefan E., Ilia) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.55r2=1.579.2.56diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.55 php-src/configure.in:1.579.2.56 --- php-src/configure.in:1.579.2.55 Tue Aug 15 13:17:08 2006 +++ php-src/configure.inWed Aug 23 13:17:36 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.55 2006/08/15 13:17:08 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.56 2006/08/23 13:17:36 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=6 -EXTRA_VERSION=-dev +EXTRA_VERSION= VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.40r2=1.112.2.41diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.40 php-src/main/php_version.h:1.112.2.41 --- php-src/main/php_version.h:1.112.2.40 Tue Aug 15 13:17:08 2006 +++ php-src/main/php_version.h Wed Aug 23 13:17:36 2006 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 6 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.1.6-dev +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.1.6 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main/streams plain_wrapper.c
dmitry Tue Aug 22 06:16:19 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/main/streams plain_wrapper.c
Log:
Fixed bug #38488 (Access to php://stdin and family crashes PHP on win32)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.569r2=1.2027.2.570diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.569 php-src/NEWS:1.2027.2.570
--- php-src/NEWS:1.2027.2.569 Tue Aug 15 13:17:08 2006
+++ php-src/NEWSTue Aug 22 06:16:19 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.1.6
+- Fixed bug #38488 (Access to php://stdin and family crashes PHP on win32).
+ (Dmitry)
17 Aug 2006, PHP 5.1.5
- Fixed memory_limit on 64bit systems. (Stefan E.)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6r2=1.52.2.7diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6
php-src/main/streams/plain_wrapper.c:1.52.2.7
--- php-src/main/streams/plain_wrapper.c:1.52.2.6 Tue Jan 17 02:32:09 2006
+++ php-src/main/streams/plain_wrapper.cTue Aug 22 06:16:19 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6 2006/01/17 02:32:09 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.7 2006/08/22 06:16:19 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -194,10 +194,9 @@
#elif defined(PHP_WIN32)
{
long handle = _get_osfhandle(self-fd);
- DWORD in_buf_size, out_buf_size;
if (handle != 0x) {
- self-is_pipe = GetNamedPipeInfo((HANDLE)handle, NULL,
out_buf_size, in_buf_size, NULL);
+ self-is_pipe = GetFileType((HANDLE)handle) ==
FILE_TYPE_PIPE;
}
}
#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_1) / NEWS configure.in /main php_version.h
iliaa Tue Aug 15 13:14:47 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.1.5 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.567r2=1.2027.2.568diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.567 php-src/NEWS:1.2027.2.568 --- php-src/NEWS:1.2027.2.567 Fri Aug 11 19:27:17 2006 +++ php-src/NEWSTue Aug 15 13:14:47 2006 @@ -1,6 +1,6 @@ PHPNEWS ||| -10 Aug 2006, PHP 5.1.5RC1 +17 Aug 2006, PHP 5.1.5 - Fixed memory_limit on 64bit systems. (Stefan E.) - Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.) - Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or safe_mode are http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.53r2=1.579.2.54diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.53 php-src/configure.in:1.579.2.54 --- php-src/configure.in:1.579.2.53 Fri Aug 11 03:02:55 2006 +++ php-src/configure.inTue Aug 15 13:14:47 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.53 2006/08/11 03:02:55 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.54 2006/08/15 13:14:47 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=5 -EXTRA_VERSION=RC1 +EXTRA_VERSION= VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.38r2=1.112.2.39diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.38 php-src/main/php_version.h:1.112.2.39 --- php-src/main/php_version.h:1.112.2.38 Fri Aug 11 03:02:56 2006 +++ php-src/main/php_version.h Tue Aug 15 13:14:47 2006 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 5.1.5RC1 +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.1.5 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
iliaa Tue Aug 15 13:17:08 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.568r2=1.2027.2.569diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.568 php-src/NEWS:1.2027.2.569 --- php-src/NEWS:1.2027.2.568 Tue Aug 15 13:14:47 2006 +++ php-src/NEWSTue Aug 15 13:17:08 2006 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2006, PHP 5.1.6 + 17 Aug 2006, PHP 5.1.5 - Fixed memory_limit on 64bit systems. (Stefan E.) - Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.54r2=1.579.2.55diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.54 php-src/configure.in:1.579.2.55 --- php-src/configure.in:1.579.2.54 Tue Aug 15 13:14:47 2006 +++ php-src/configure.inTue Aug 15 13:17:08 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.54 2006/08/15 13:14:47 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.55 2006/08/15 13:17:08 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,8 +41,8 @@ MAJOR_VERSION=5 MINOR_VERSION=1 -RELEASE_VERSION=5 -EXTRA_VERSION= +RELEASE_VERSION=6 +EXTRA_VERSION=-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.39r2=1.112.2.40diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.39 php-src/main/php_version.h:1.112.2.40 --- php-src/main/php_version.h:1.112.2.39 Tue Aug 15 13:14:47 2006 +++ php-src/main/php_version.h Tue Aug 15 13:17:08 2006 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.1.5 +#define PHP_RELEASE_VERSION 6 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.1.6-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug38431.phpt
tony2001Fri Aug 11 17:44:48 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/xmlrpc/tests bug38431.phpt
Modified files:
/php-srcNEWS
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
MFH: fix #38431 (xmlrpc_get_type() crashes PHP on objects)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.565r2=1.2027.2.566diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.565 php-src/NEWS:1.2027.2.566
--- php-src/NEWS:1.2027.2.565 Fri Aug 11 03:02:55 2006
+++ php-src/NEWSFri Aug 11 17:44:47 2006
@@ -5,6 +5,7 @@
- Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.)
- Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or safe_mode are
enabled. (Stefan E., Ilia)
+- Fixed bug #38431 (xmlrpc_get_type() crashes PHP on objects). (Tony)
- Fixed bug #38322 (reading past array in sscanf() leads to arbitrary code
execution). (Tony)
- Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5r2=1.39.2.6diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.6
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5Wed Apr 12 15:13:56 2006
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Fri Aug 11 17:44:48 2006
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5 2006/04/12 15:13:56 tony2001 Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.6 2006/08/11 17:44:48 tony2001 Exp $ */
/**
* BUGS: *
@@ -1468,7 +1468,7 @@
type = get_zval_xmlrpc_type(*arg, 0);
if (type == xmlrpc_vector) {
- vtype = determine_vector_type(Z_ARRVAL_PP(arg));
+ vtype = determine_vector_type((Z_TYPE_PP(arg) == IS_OBJECT) ?
Z_OBJPROP_PP(arg) : Z_ARRVAL_PP(arg));
}
RETURN_STRING((char*) xmlrpc_type_as_str(type, vtype), 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug38431.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug38431.phpt
+++ php-src/ext/xmlrpc/tests/bug38431.phpt
--TEST--
Bug #38431 (xmlrpc_get_type() crashes PHP on objects)
--SKIPIF--
?php if (!extension_loaded(xmlrpc)) print skip; ?
--FILE--
?php
var_dump(xmlrpc_get_type(new stdclass));
var_dump(xmlrpc_get_type(array()));
$var = array(1,2,3);
var_dump(xmlrpc_get_type($var));
$var = array(test=1,2,3);
var_dump(xmlrpc_get_type($var));
$var = array(test=1,test2=2);
var_dump(xmlrpc_get_type($var));
echo Done\n;
?
--EXPECTF--
string(5) array
string(5) array
string(5) array
string(5) mixed
string(6) struct
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_1) / NEWS /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug38431.phpt
Tony, The 5.1 is for security fixes only, especially this late in the game, please revert this patch. Ilia Alshanetsky -- 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_1) / NEWS /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug38431.phpt
On 11.08.2006 23:06, Ilia Alshanetsky wrote: Tony, The 5.1 is for security fixes only, especially this late in the game, please revert this patch. Ilia Alshanetsky Done. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
tony2001Fri Aug 11 19:27:17 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: one bugfix less http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.566r2=1.2027.2.567diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.566 php-src/NEWS:1.2027.2.567 --- php-src/NEWS:1.2027.2.566 Fri Aug 11 17:44:47 2006 +++ php-src/NEWSFri Aug 11 19:27:17 2006 @@ -5,7 +5,6 @@ - Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.) - Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or safe_mode are enabled. (Stefan E., Ilia) -- Fixed bug #38431 (xmlrpc_get_type() crashes PHP on objects). (Tony) - Fixed bug #38322 (reading past array in sscanf() leads to arbitrary code execution). (Tony) - Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (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_1) / NEWS /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug38431.phpt
On 11-Aug-06, at 3:16 PM, Antony Dovgal wrote: On 11.08.2006 23:06, Ilia Alshanetsky wrote: Tony, The 5.1 is for security fixes only, especially this late in the game, please revert this patch. Ilia Alshanetsky Done. Thanks. Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/curl interface.c streams.c /ext/standard string.c
iliaa Thu Aug 10 17:16:35 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard string.c
/php-src/ext/curl interface.c streams.c
Log:
Various security fixes backported from 5.2
# part 2
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.562r2=1.2027.2.563diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.562 php-src/NEWS:1.2027.2.563
--- php-src/NEWS:1.2027.2.562 Fri Aug 4 20:34:31 2006
+++ php-src/NEWSThu Aug 10 17:16:35 2006
@@ -1,6 +1,10 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.1.5
+- Fixed memory_limit on 64bit systems. (Stefan E.)
+- Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.)
+- Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or safe_mode are
+ enabled. (Stefan E., Ilia)
- Fixed bug #38322 (reading past array in sscanf() leads to arbitary code
execution). (Tony)
- Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus)
@@ -21,6 +25,8 @@
- Fixed bug #37360 (invalid gif size) (Pierre)
- Fixed bug #37306 (max_execution_time = max_input_time). (Dmitry)
- Fixed Bug #37278 (SOAP not respecting uri in __soapCall). (Dmitry)
+- Fixed bug #37265 (Added missing safe_mode open_basedir checks to
+ imap_body()). (Ilia)
- Fixed bug #37256 (php-fastcgi dosen't handle connection abort). (Dmitry)
04 May 2006, PHP 5.1.4
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14r2=1.445.2.15diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14
php-src/ext/standard/string.c:1.445.2.15
--- php-src/ext/standard/string.c:1.445.2.14Tue Apr 25 12:48:41 2006
+++ php-src/ext/standard/string.c Thu Aug 10 17:16:35 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14 2006/04/25 12:48:41 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.15 2006/08/10 17:16:35 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -632,7 +632,8 @@
{
const char *text, *breakchar = \n;
char *newtext;
- int textlen, breakcharlen = 1, newtextlen, alloced, chk;
+ int textlen, breakcharlen = 1, newtextlen, chk;
+ size_t alloced;
long current = 0, laststart = 0, lastspace = 0;
long linelength = 75;
zend_bool docut = 0;
@@ -1612,10 +1613,18 @@
RETURN_FALSE;
}
+ if (haystack_len == 0) {
+ RETURN_FALSE;
+ }
+
haystack_dup = estrndup(haystack, haystack_len);
php_strtolower(haystack_dup, haystack_len);
if (Z_TYPE_P(needle) == IS_STRING) {
+ if ((Z_STRLEN_P(needle) == 0 || Z_STRLEN_P(needle)
haystack_len) {
+ efree(haystack_dup);
+ RETURN_FALSE;
+ }
needle_dup = estrndup(Z_STRVAL_P(needle), Z_STRLEN_P(needle));
php_strtolower(needle_dup, Z_STRLEN_P(needle));
found = php_memnstr(haystack_dup + offset, needle_dup,
Z_STRLEN_P(needle), haystack_dup + haystack_len);
@@ -4194,7 +4203,7 @@
zval**input_str;/* Input string */
zval**mult; /* Multiplier */
char*result;/* Resulting string */
- int result_len; /* Length of the resulting
string */
+ size_t result_len; /* Length of the resulting
string */
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, input_str,
mult) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -4219,11 +4228,7 @@
/* Initialize the result string */
result_len = Z_STRLEN_PP(input_str) * Z_LVAL_PP(mult);
- if (result_len 1 || result_len 2147483647) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, You may not create
strings longer than 2147483647 bytes);
- RETURN_FALSE;
- }
- result = (char *)emalloc(result_len + 1);
+ result = (char *)safe_emalloc(Z_STRLEN_PP(input_str), Z_LVAL_PP(mult),
1);
/* Heavy optimization for situations where input string is 1 byte long
*/
if (Z_STRLEN_PP(input_str) == 1) {
@@ -4894,7 +4899,7 @@
offset = (offset 0) ? 0 : offset;
}
- if ((offset + len) = s1_len) {
+ if ((offset + len) s1_len) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The start position
cannot exceed initial string length);
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.15r2=1.62.2.16diff_format=u
Index: php-src/ext/curl/interface.c
diff -u
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/gd/libgd gd.c gd_gd2.c gd_gif_in.c gd_gif_out.c
iliaa Thu Aug 10 18:34:22 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/gd/libgd gd.c gd_gd2.c gd_gif_in.c gd_gif_out.c
Log:
MFH: Fixed bug #38112 (corrupted gif segfaults) (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.563r2=1.2027.2.564diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.563 php-src/NEWS:1.2027.2.564
--- php-src/NEWS:1.2027.2.563 Thu Aug 10 17:16:35 2006
+++ php-src/NEWSThu Aug 10 18:34:22 2006
@@ -8,6 +8,7 @@
- Fixed bug #38322 (reading past array in sscanf() leads to arbitary code
execution). (Tony)
- Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus)
+- Fixed bug #38112 (corrupted gif segfaults) (Pierre)
- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
- Fixed bug #37576 (FastCGI env (cgi vars) table overflow). (Piotr)
- Fixed bug #37496 (FastCGI output buffer overrun). (Piotr, Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.c?r1=1.90.2.1r2=1.90.2.2diff_format=u
Index: php-src/ext/gd/libgd/gd.c
diff -u php-src/ext/gd/libgd/gd.c:1.90.2.1 php-src/ext/gd/libgd/gd.c:1.90.2.2
--- php-src/ext/gd/libgd/gd.c:1.90.2.1 Fri Sep 30 20:48:05 2005
+++ php-src/ext/gd/libgd/gd.c Thu Aug 10 18:34:22 2006
@@ -2161,7 +2161,7 @@
for (x = 0; (x w); x++) {
int c = gdImageGetPixel (src, srcX + x,
srcY + y);
if (c != src-transparent) {
- gdImageSetPixel (dst, dstX + x,
dstY + y, gdTrueColor(src-red[c], src-green[c], src-blue[c]));
+ gdImageSetPixel(dst, dstX + x,
dstY + y, gdTrueColorAlpha(src-red[c], src-green[c], src-blue[c],
src-alpha[c]));
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gd2.c?r1=1.16.4.1r2=1.16.4.2diff_format=u
Index: php-src/ext/gd/libgd/gd_gd2.c
diff -u php-src/ext/gd/libgd/gd_gd2.c:1.16.4.1
php-src/ext/gd/libgd/gd_gd2.c:1.16.4.2
--- php-src/ext/gd/libgd/gd_gd2.c:1.16.4.1 Thu Aug 18 12:54:43 2005
+++ php-src/ext/gd/libgd/gd_gd2.c Thu Aug 10 18:34:22 2006
@@ -430,6 +430,10 @@
gdImagePtr im;
+ if (w1 || h 1) {
+ return 0;
+ }
+
/* The next few lines are basically copied from gd2CreateFromFile
* we change the file size, so don't want to use the code directly.
* but we do need to know the file size.
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd_gif_in.c?r1=1.5.4.4r2=1.5.4.5diff_format=u
Index: php-src/ext/gd/libgd/gd_gif_in.c
diff -u php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.4
php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.5
--- php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.4Mon May 8 11:56:14 2006
+++ php-src/ext/gd/libgd/gd_gif_in.cThu Aug 10 18:34:22 2006
@@ -185,18 +185,15 @@
bitPixel = 1((buf[8]0x07)+1);
+ if (!(im = gdImageCreate(imw, imh))) {
+ return 0;
+ }
+ im-interlace = BitSet(buf[8], INTERLACE);
if (! useGlobalColormap) {
- if (ReadColorMap(fd, bitPixel, localColorMap)) {
+ if (ReadColorMap(fd, bitPixel, localColorMap)) {
return 0;
}
- }
-
- if (!(im = gdImageCreate(imw, imh))) {
- return 0;
- }
- im-interlace = BitSet(buf[8], INTERLACE);
- if (! useGlobalColormap) {
ReadImage(im, fd, imw, imh, localColorMap,
BitSet(buf[8], INTERLACE));
/*1.4//imageCount != imageNumber); */
@@ -217,6 +214,10 @@
if (!im) {
return 0;
}
+ if (!im-colorsTotal) {
+ gdImageDestroy(im);
+ return 0;
+ }
/* Check for open colors at the end, so
we can reduce colorsTotal and ultimately
BitsPerPixel */
@@ -507,6 +508,18 @@
int v;
int xpos = 0, ypos = 0, pass = 0;
int i;
+
+ /*
+ ** Initialize the Compression routines
+ */
+ if (! ReadOK(fd,c,1)) {
+ return;
+ }
+
+ if (c MAX_LWZ_BITS) {
+ return;
+ }
+
/* Stash the color map into the image */
for (i=0; (igdMaxColors); i++) {
im-red[i] = cmap[CM_RED][i];
@@ -516,12 +529,7 @@
}
/* Many (perhaps most) of these colors will remain marked open. */
im-colorsTotal = gdMaxColors;
- /*
- ** Initialize the Compression routines
- */
- if (! ReadOK(fd,c,1)) {
-
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
iliaa Fri Aug 11 03:02:56 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.1.5RC1 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.564r2=1.2027.2.565diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.564 php-src/NEWS:1.2027.2.565 --- php-src/NEWS:1.2027.2.564 Thu Aug 10 18:34:22 2006 +++ php-src/NEWSFri Aug 11 03:02:55 2006 @@ -1,11 +1,11 @@ PHPNEWS ||| -?? ??? 2006, PHP 5.1.5 +10 Aug 2006, PHP 5.1.5RC1 - Fixed memory_limit on 64bit systems. (Stefan E.) - Fixed overflow on 64bit systems in str_repeat() and wordwrap(). (Stefan E.) - Disabled CURLOPT_FOLLOWLOCATION in curl when open_basedir or safe_mode are enabled. (Stefan E., Ilia) -- Fixed bug #38322 (reading past array in sscanf() leads to arbitary code +- Fixed bug #38322 (reading past array in sscanf() leads to arbitrary code execution). (Tony) - Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus) - Fixed bug #38112 (corrupted gif segfaults) (Pierre) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52r2=1.579.2.53diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52 php-src/configure.in:1.579.2.53 --- php-src/configure.in:1.579.2.52 Wed May 3 23:31:43 2006 +++ php-src/configure.inFri Aug 11 03:02:55 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.52 2006/05/03 23:31:43 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.53 2006/08/11 03:02:55 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=5 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37r2=1.112.2.38diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37 php-src/main/php_version.h:1.112.2.38 --- php-src/main/php_version.h:1.112.2.37 Wed May 3 23:31:43 2006 +++ php-src/main/php_version.h Fri Aug 11 03:02:56 2006 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.1.5-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 5.1.5RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard scanf.c
tony2001Fri Aug 4 20:34:31 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard scanf.c
Log:
MFH: fix #38322 (reading past array in sscanf() leads to arbitary code
execution)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.561r2=1.2027.2.562diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.561 php-src/NEWS:1.2027.2.562
--- php-src/NEWS:1.2027.2.561 Mon Jul 17 21:13:33 2006
+++ php-src/NEWSFri Aug 4 20:34:31 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.1.5
+- Fixed bug #38322 (reading past array in sscanf() leads to arbitary code
+ execution). (Tony)
- Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus)
- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
- Fixed bug #37576 (FastCGI env (cgi vars) table overflow). (Piotr)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/scanf.c?r1=1.31.2.2r2=1.31.2.3diff_format=u
Index: php-src/ext/standard/scanf.c
diff -u php-src/ext/standard/scanf.c:1.31.2.2
php-src/ext/standard/scanf.c:1.31.2.3
--- php-src/ext/standard/scanf.c:1.31.2.2 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/scanf.cFri Aug 4 20:34:31 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: scanf.c,v 1.31.2.2 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: scanf.c,v 1.31.2.3 2006/08/04 20:34:31 tony2001 Exp $ */
/*
scanf.c --
@@ -732,7 +732,7 @@
if (*end == '$') {
format = end+1;
ch = format++;
- objIndex = varStart + value;
+ objIndex = varStart + value - 1;
}
}
@@ -762,7 +762,9 @@
switch (*ch) {
case 'n':
if (!(flags SCAN_SUPPRESS)) {
- if (numVars) {
+ if (numVars objIndex = argCount) {
+ break;
+ } else if (numVars) {
zend_uint refcount;
current = args[objIndex++];
@@ -888,7 +890,9 @@
}
}
if (!(flags SCAN_SUPPRESS)) {
- if (numVars) {
+ if (numVars objIndex = argCount) {
+ break;
+ } else if (numVars) {
zend_uint refcount;
current = args[objIndex++];
@@ -932,7 +936,9 @@
goto done;
}
if (!(flags SCAN_SUPPRESS)) {
- if (numVars) {
+ if (numVars objIndex = argCount) {
+ break;
+ } else if (numVars) {
current = args[objIndex++];
zval_dtor( *current );
ZVAL_STRINGL( *current, string,
end-string, 1);
@@ -1089,7 +1095,9 @@
value = (int) (*fn)(buf, NULL, base);
if ((flags SCAN_UNSIGNED) (value
0)) {
sprintf(buf, %u, value); /*
INTL: ISO digit */
- if (numVars) {
+ if (numVars objIndex =
argCount) {
+ break;
+ } else if (numVars) {
/* change passed value type
to string */
current = args[objIndex++];
convert_to_string( *current
);
@@ -1098,7 +1106,9 @@
add_index_string(*return_value, objIndex++, buf, 1);
}
} else {
- if (numVars) {
+ if (numVars objIndex =
argCount) {
+
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/spl spl_iterators.c
helly Mon Jul 17 21:13:33 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_iterators.c
/php-srcNEWS
Log:
- MFH Fix #38125 undefined reference to spl_dual_it_free_storage
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.32r2=1.73.2.33diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.32
php-src/ext/spl/spl_iterators.c:1.73.2.33
--- php-src/ext/spl/spl_iterators.c:1.73.2.32 Mon Jul 17 21:12:23 2006
+++ php-src/ext/spl/spl_iterators.c Mon Jul 17 21:13:32 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.32 2006/07/17 21:12:23 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.33 2006/07/17 21:13:32 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1253,7 +1253,7 @@
} /* }}} */
/* {{{ spl_dual_it_free_storage */
-static inline void spl_dual_it_free_storage(void *_object TSRMLS_DC)
+static void spl_dual_it_free_storage(void *_object TSRMLS_DC)
{
spl_dual_it_object*object = (spl_dual_it_object *)_object;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.560r2=1.2027.2.561diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.560 php-src/NEWS:1.2027.2.561
--- php-src/NEWS:1.2027.2.560 Thu May 25 10:01:30 2006
+++ php-src/NEWSMon Jul 17 21:13:33 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.1.5
+- Fixed bug #38125 (undefined reference to spl_dual_it_free_storage). (Marcus)
- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
- Fixed bug #37576 (FastCGI env (cgi vars) table overflow). (Piotr)
- Fixed bug #37496 (FastCGI output buffer overrun). (Piotr, Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /sapi/cgi fastcgi.c
dmitry Thu May 25 06:40:21 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/sapi/cgi fastcgi.c
Log:
Fixed bug #37496 (FastCGI output buffer overrun)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.556r2=1.2027.2.557diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.556 php-src/NEWS:1.2027.2.557
--- php-src/NEWS:1.2027.2.556 Wed May 24 09:42:46 2006
+++ php-src/NEWSThu May 25 06:40:21 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.?.?
+- Fixed bug #37496 (FastCGI output buffer overrun). (Piotr, Dmitry)
- Fixed bug #37487 (oci_fetch_array() array-type should always default to
OCI_BOTH). (Tony)
- Fixed bug #37416 (iterator_to_array() hides exceptions thrown in rewind()
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.14r2=1.4.2.15diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.14 php-src/sapi/cgi/fastcgi.c:1.4.2.15
--- php-src/sapi/cgi/fastcgi.c:1.4.2.14 Mon May 22 09:22:40 2006
+++ php-src/sapi/cgi/fastcgi.c Thu May 25 06:40:21 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.14 2006/05/22 09:22:40 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.15 2006/05/25 06:40:21 dmitry Exp $ */
#include fastcgi.h
#include php.h
@@ -803,6 +803,7 @@
limit = sizeof(req-out_buf) - (req-out_pos - req-out_buf);
if (!req-out_hdr) {
limit -= sizeof(fcgi_header);
+ if (limit 0) limit = 0;
}
if (len limit) {
@@ -815,8 +816,10 @@
if (!req-out_hdr) {
open_packet(req, type);
}
- memcpy(req-out_pos, str, limit);
- req-out_pos += limit;
+ if (limit 0) {
+ memcpy(req-out_pos, str, limit);
+ req-out_pos += limit;
+ }
if (!fcgi_flush(req, 0)) {
return -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_1) / NEWS /sapi/cgi fastcgi.c fastcgi.h
dmitry Thu May 25 07:06:04 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/sapi/cgi fastcgi.c fastcgi.h
Log:
Fixed bug #37576 (FastCGI env (cgi vars) table overflow). (Piotr)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.557r2=1.2027.2.558diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.557 php-src/NEWS:1.2027.2.558
--- php-src/NEWS:1.2027.2.557 Thu May 25 06:40:21 2006
+++ php-src/NEWSThu May 25 07:06:04 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.?.?
+- Fixed bug #37576 (FastCGI env (cgi vars) table overflow). (Piotr)
- Fixed bug #37496 (FastCGI output buffer overrun). (Piotr, Dmitry)
- Fixed bug #37487 (oci_fetch_array() array-type should always default to
OCI_BOTH). (Tony)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.15r2=1.4.2.16diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.15 php-src/sapi/cgi/fastcgi.c:1.4.2.16
--- php-src/sapi/cgi/fastcgi.c:1.4.2.15 Thu May 25 06:40:21 2006
+++ php-src/sapi/cgi/fastcgi.c Thu May 25 07:06:04 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.15 2006/05/25 06:40:21 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.16 2006/05/25 07:06:04 dmitry Exp $ */
#include fastcgi.h
#include php.h
@@ -401,7 +401,7 @@
int name_len, val_len;
char *s;
- while (p end) {
+ while (p end n FCGI_MAX_ENV_VARS - 1) {
name_len = *p++;
if (name_len = 128) {
name_len = ((name_len 0x7f) 24);
@@ -424,10 +424,6 @@
p += val_len;
s[name_len+1+val_len] = '\0';
n++;
- if (n sizeof(req-env)/sizeof(req-env[0])) {
- /* TODO: to many environment variables */
- return n;
- }
}
return n;
}
@@ -915,7 +911,9 @@
}
env++;
}
- *env = fcgi_strndup(var, var_len);
+ if (env != req-env[FCGI_MAX_ENV_VARS - 1]) {
+ *env = fcgi_strndup(var, var_len);
+ }
}
}
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.2.2.5r2=1.2.2.6diff_format=u
Index: php-src/sapi/cgi/fastcgi.h
diff -u php-src/sapi/cgi/fastcgi.h:1.2.2.5 php-src/sapi/cgi/fastcgi.h:1.2.2.6
--- php-src/sapi/cgi/fastcgi.h:1.2.2.5 Wed May 24 09:42:46 2006
+++ php-src/sapi/cgi/fastcgi.h Thu May 25 07:06:04 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.h,v 1.2.2.5 2006/05/24 09:42:46 dmitry Exp $ */
+/* $Id: fastcgi.h,v 1.2.2.6 2006/05/25 07:06:04 dmitry Exp $ */
/* FastCGI protocol */
@@ -26,6 +26,8 @@
#define FCGI_KEEP_CONN 1
+#define FCGI_MAX_ENV_VARS 256
+
typedef enum _fcgi_role {
FCGI_RESPONDER = 1,
FCGI_AUTHORIZER = 2,
@@ -105,7 +107,7 @@
unsigned char out_buf[1024*8];
unsigned char reserved[sizeof(fcgi_end_request_rec)];
- char *env[128];
+ char *env[FCGI_MAX_ENV_VARS];
} fcgi_request;
int fcgi_init(void);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug37278.phpt
dmitry Thu May 25 08:14:51 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/soap/tests/bugsbug37278.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #37278 (SOAP not respecting uri in __soapCall)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.558r2=1.2027.2.559diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.558 php-src/NEWS:1.2027.2.559
--- php-src/NEWS:1.2027.2.558 Thu May 25 07:06:04 2006
+++ php-src/NEWSThu May 25 08:14:50 2006
@@ -16,6 +16,7 @@
- Fixed bug #37346 (invalid colormap format) (Pierre)
- Fixed bug #37360 (invalid gif size) (Pierre)
- Fixed bug #37306 (max_execution_time = max_input_time). (Dmitry)
+- Fixed Bug #37278 (SOAP not respecting uri in __soapCall). (Dmitry)
- Fixed bug #37256 (php-fastcgi dosen't handle connection abort). (Dmitry)
04 May 2006, PHP 5.1.4
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28r2=1.156.2.29diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28 php-src/ext/soap/soap.c:1.156.2.29
--- php-src/ext/soap/soap.c:1.156.2.28 Wed May 3 06:36:02 2006
+++ php-src/ext/soap/soap.c Thu May 25 08:14:50 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28 2006/05/03 06:36:02 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.29 2006/05/25 08:14:50 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2671,7 +2671,7 @@
if (zend_hash_find(ht, uri, sizeof(uri),
(void**)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_STRING) {
- soap_action = Z_STRVAL_PP(tmp);
+ uri = Z_STRVAL_PP(tmp);
}
} else if (Z_TYPE_P(options) != IS_NULL) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, first
parameter must be string or null);
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37278.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug37278.phpt
+++ php-src/ext/soap/tests/bugs/bug37278.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/wddx wddx.c
helly Thu May 25 10:01:30 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/wddx wddx.c
Log:
- MFH Fixed bug #37587 (var without attribute causes segfault
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.559r2=1.2027.2.560diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.559 php-src/NEWS:1.2027.2.560
--- php-src/NEWS:1.2027.2.559 Thu May 25 08:14:50 2006
+++ php-src/NEWSThu May 25 10:01:30 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
-?? ??? 2006, PHP 5.?.?
+?? ??? 2006, PHP 5.1.5
+- Fixed bug #37587 (var without attribute causes segfault). (Marcus)
- Fixed bug #37576 (FastCGI env (cgi vars) table overflow). (Piotr)
- Fixed bug #37496 (FastCGI output buffer overrun). (Piotr, Dmitry)
- Fixed bug #37487 (oci_fetch_array() array-type should always default to
http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.10r2=1.119.2.11diff_format=u
Index: php-src/ext/wddx/wddx.c
diff -u php-src/ext/wddx/wddx.c:1.119.2.10 php-src/ext/wddx/wddx.c:1.119.2.11
--- php-src/ext/wddx/wddx.c:1.119.2.10 Sun Apr 23 16:02:05 2006
+++ php-src/ext/wddx/wddx.c Thu May 25 10:01:30 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: wddx.c,v 1.119.2.10 2006/04/23 16:02:05 iliaa Exp $ */
+/* $Id: wddx.c,v 1.119.2.11 2006/05/25 10:01:30 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -751,7 +751,7 @@
} else if (!strcmp(name, EL_CHAR)) {
int i;
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], EL_CHAR_CODE) atts[++i]
atts[i][0]) {
char tmp_buf[2];
@@ -771,7 +771,7 @@
} else if (!strcmp(name, EL_BOOLEAN)) {
int i;
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], EL_VALUE) atts[++i]
atts[i][0]) {
ent.type = ST_BOOLEAN;
SET_STACK_VARNAME;
@@ -812,7 +812,7 @@
} else if (!strcmp(name, EL_VAR)) {
int i;
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], EL_NAME) atts[++i]
atts[i][0]) {
char *decoded;
int decoded_len;
@@ -829,7 +829,7 @@
MAKE_STD_ZVAL(ent.data);
array_init(ent.data);
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], fieldNames) atts[++i]
atts[i][0]) {
zval *tmp;
char *key;
@@ -869,7 +869,7 @@
ent.varname = NULL;
ent.data = NULL;
- for (i = 0; atts[i]; i++) {
+ if (atts) for (i = 0; atts[i]; i++) {
if (!strcmp(atts[i], EL_NAME) atts[++i]
atts[i][0]) {
char *decoded;
int decoded_len;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /sapi/cgi cgi_main.c
dmitry Wed May 24 07:55:38 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #37341 ($_SERVER in included file is shortened to two entries, if
$_ENV gets used).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.554r2=1.2027.2.555diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.554 php-src/NEWS:1.2027.2.555
--- php-src/NEWS:1.2027.2.554 Thu May 18 13:21:44 2006
+++ php-src/NEWSWed May 24 07:55:37 2006
@@ -7,6 +7,8 @@
method). (Tony)
- Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of
request). (Tony)
+- Fixed bug #37341 ($_SERVER in included file is shortened to two entries,
+ if $_ENV gets used). (Dmitry)
- Fixed bug #37313 (sigemptyset() used without including signal.h).
(jdolecek)
- Fixed bug #37346 (invalid colormap format) (Pierre)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15r2=1.267.2.16diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15
php-src/sapi/cgi/cgi_main.c:1.267.2.16
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15 Wed May 3 19:40:58 2006
+++ php-src/sapi/cgi/cgi_main.c Wed May 24 07:55:38 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15 2006/05/03 19:40:58 tony2001 Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.16 2006/05/24 07:55:38 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -432,14 +432,18 @@
void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC)
{
if (PG(http_globals)[TRACK_VARS_ENV]
- array_ptr != PG(http_globals)[TRACK_VARS_ENV]) {
+ array_ptr != PG(http_globals)[TRACK_VARS_ENV]
+ Z_TYPE_P(PG(http_globals)[TRACK_VARS_ENV]) == IS_ARRAY
+
zend_hash_num_elements(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_ENV])) 0) {
zval_dtor(array_ptr);
*array_ptr = *PG(http_globals)[TRACK_VARS_ENV];
INIT_PZVAL(array_ptr);
zval_copy_ctor(array_ptr);
return;
} else if (PG(http_globals)[TRACK_VARS_SERVER]
- array_ptr != PG(http_globals)[TRACK_VARS_SERVER]) {
+ array_ptr != PG(http_globals)[TRACK_VARS_SERVER]
+ Z_TYPE_P(PG(http_globals)[TRACK_VARS_SERVER]) == IS_ARRAY
+
zend_hash_num_elements(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER])) 0) {
zval_dtor(array_ptr);
*array_ptr = *PG(http_globals)[TRACK_VARS_SERVER];
INIT_PZVAL(array_ptr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /sapi/cgi fastcgi.h
dmitry Wed May 24 09:42:46 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/sapi/cgi fastcgi.h Log: Fixed bug #37256 (php-fastcgi dosen't handle connection abort) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.555r2=1.2027.2.556diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.555 php-src/NEWS:1.2027.2.556 --- php-src/NEWS:1.2027.2.555 Wed May 24 07:55:37 2006 +++ php-src/NEWSWed May 24 09:42:46 2006 @@ -14,6 +14,7 @@ - Fixed bug #37346 (invalid colormap format) (Pierre) - Fixed bug #37360 (invalid gif size) (Pierre) - Fixed bug #37306 (max_execution_time = max_input_time). (Dmitry) +- Fixed bug #37256 (php-fastcgi dosen't handle connection abort). (Dmitry) 04 May 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.2.2.4r2=1.2.2.5diff_format=u Index: php-src/sapi/cgi/fastcgi.h diff -u php-src/sapi/cgi/fastcgi.h:1.2.2.4 php-src/sapi/cgi/fastcgi.h:1.2.2.5 --- php-src/sapi/cgi/fastcgi.h:1.2.2.4 Wed May 3 15:39:16 2006 +++ php-src/sapi/cgi/fastcgi.h Wed May 24 09:42:46 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: fastcgi.h,v 1.2.2.4 2006/05/03 15:39:16 dmitry Exp $ */ +/* $Id: fastcgi.h,v 1.2.2.5 2006/05/24 09:42:46 dmitry Exp $ */ /* FastCGI protocol */ @@ -160,7 +160,7 @@ #define FCGX_PutStr(str, len, stream) fcgi_write((stream).req, (stream).type, str, len) #define FCGX_PutS(str, len, stream) fcgi_write((stream).req, (stream).type, str, len) -#define FCGX_FFlush(stream) fcgi_flush((stream).req, 0) +#define FCGX_FFlush(stream) (fcgi_flush((stream).req, 0)?0:-1) #define FCGX_GetStr(str, len, stream) fcgi_read((stream).req, str, len) #define FCGX_GetParam(var, envp) fcgi_getenv_helper(envp, var, strlen(var)); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main main.c /sapi/cli php_cli.c
dmitry Thu May 11 22:11:17 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/main main.c
/php-src/sapi/cli php_cli.c
Log:
Fixed bug #37306 (max_execution_time = max_input_time)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.551r2=1.2027.2.552diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.551 php-src/NEWS:1.2027.2.552
--- php-src/NEWS:1.2027.2.551 Wed May 10 10:08:23 2006
+++ php-src/NEWSThu May 11 22:11:17 2006
@@ -7,6 +7,7 @@
(jdolecek)
- Fixed bug #37346 (invalid colormap format) (Pierre)
- Fixed bug #37360 (invalid gif size) (Pierre)
+- Fixed bug #37306 (max_execution_time = max_input_time). (Dmitry)
04 May 2006, PHP 5.1.4
- Added capture_peer_cert and capture_peer_cert_chain context options
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.23r2=1.640.2.24diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23 php-src/main/main.c:1.640.2.24
--- php-src/main/main.c:1.640.2.23 Wed Apr 12 12:49:39 2006
+++ php-src/main/main.c Thu May 11 22:11:17 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.23 2006/04/12 12:49:39 tony2001 Exp $ */
+/* $Id: main.c,v 1.640.2.24 2006/05/11 22:11:17 dmitry Exp $ */
/* {{{ includes
*/
@@ -1723,11 +1723,11 @@
} else {
append_file_p = NULL;
}
- if (PG(max_input_time) == -1) {
+ if (PG(max_input_time) != -1) {
#ifdef PHP_WIN32
zend_unset_timeout(TSRMLS_C);
#endif
- zend_set_timeout(EG(timeout_seconds));
+ zend_set_timeout(INI_INT(max_execution_time));
}
retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3,
prepend_file_p, primary_file, append_file_p) == SUCCESS);
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13r2=1.129.2.14diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13
php-src/sapi/cli/php_cli.c:1.129.2.14
--- php-src/sapi/cli/php_cli.c:1.129.2.13 Tue Feb 21 21:15:13 2006
+++ php-src/sapi/cli/php_cli.c Thu May 11 22:11:17 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_cli.c,v 1.129.2.13 2006/02/21 21:15:13 johannes Exp $ */
+/* $Id: php_cli.c,v 1.129.2.14 2006/05/11 22:11:17 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -708,6 +708,7 @@
INI_HARDCODED(implicit_flush, 1);
INI_HARDCODED(output_buffering, 0);
INI_HARDCODED(max_execution_time, 0);
+ INI_HARDCODED(max_input_time, -1);
while ((c = php_getopt(argc, argv, OPTIONS, php_optarg,
php_optind, 0)) != -1) {
switch (c) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/oci8 oci8.c
tony2001Wed May 10 10:08:24 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8 oci8.c
/php-srcNEWS
Log:
MFH: fix #37392 (Unnecessary call to OCITransRollback() at the end of request)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16r2=1.269.2.17diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16 php-src/ext/oci8/oci8.c:1.269.2.17
--- php-src/ext/oci8/oci8.c:1.269.2.16 Wed Apr 12 19:21:35 2006
+++ php-src/ext/oci8/oci8.c Wed May 10 10:08:23 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.16 2006/04/12 19:21:35 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.17 2006/05/10 10:08:23 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -647,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.16 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.17 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1718,7 +1718,9 @@
connection-descriptors = NULL;
}
- php_oci_connection_rollback(connection TSRMLS_CC);
+ if (connection-needs_commit) {
+ php_oci_connection_rollback(connection
TSRMLS_CC);
+ }
if (OCI_G(persistent_timeout) 0) {
connection-idle_expiry = timestamp +
OCI_G(persistent_timeout);
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.550r2=1.2027.2.551diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.550 php-src/NEWS:1.2027.2.551
--- php-src/NEWS:1.2027.2.550 Mon May 8 11:56:15 2006
+++ php-src/NEWSWed May 10 10:08:23 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.?.?
+- Fixed bug #37392 (Unnecessary call to OCITransRollback() at the end of
+ request). (Tony)
- Fixed bug #37313 (sigemptyset() used without including signal.h).
(jdolecek)
- Fixed bug #37346 (invalid colormap format) (Pierre)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/gd/libgd gd_gif_in.c /ext/gd/tests bug37360.gif bug37360.phpt
pajoye Mon May 8 11:56:15 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/gd/tests bug37360.phpt bug37360.gif
Modified files:
/php-src/ext/gd/libgd gd_gif_in.c
/php-srcNEWS
Log:
- MFH: #37360, bad gif size
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/libgd/gd_gif_in.c?r1=1.5.4.3r2=1.5.4.4diff_format=u
Index: php-src/ext/gd/libgd/gd_gif_in.c
diff -u php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.3
php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.4
--- php-src/ext/gd/libgd/gd_gif_in.c:1.5.4.3Sun May 7 17:14:36 2006
+++ php-src/ext/gd/libgd/gd_gif_in.cMon May 8 11:56:14 2006
@@ -147,6 +147,9 @@
Background = buf[5];
AspectRatio = buf[6];
+ imw = LM_to_uint(buf[0],buf[1]);
+ imh = LM_to_uint(buf[2],buf[3]);
+
if (BitSet(buf[4], LOCALCOLORMAP)) {/* Global Colormap */
if (ReadColorMap(fd, BitPixel, ColorMap)) {
return 0;
@@ -182,8 +185,6 @@
bitPixel = 1((buf[8]0x07)+1);
- imw = LM_to_uint(buf[4],buf[5]);
- imh = LM_to_uint(buf[6],buf[7]);
if (! useGlobalColormap) {
if (ReadColorMap(fd, bitPixel, localColorMap)) {
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.549r2=1.2027.2.550diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.549 php-src/NEWS:1.2027.2.550
--- php-src/NEWS:1.2027.2.549 Sun May 7 18:00:28 2006
+++ php-src/NEWSMon May 8 11:56:15 2006
@@ -3,7 +3,8 @@
?? ??? 2006, PHP 5.?.?
- Fixed bug #37313 (sigemptyset() used without including signal.h).
(jdolecek)
-- Fixed bug #37346 (invalid colormap format)
+- Fixed bug #37346 (invalid colormap format) (Pierre)
+- Fixed bug #37360 (invalid gif size) (Pierre)
04 May 2006, PHP 5.1.4
- Added capture_peer_cert and capture_peer_cert_chain context options
http://cvs.php.net/viewcvs.cgi/php-src/ext/gd/tests/bug37360.phpt?view=markuprev=1.1
Index: php-src/ext/gd/tests/bug37360.phpt
+++ php-src/ext/gd/tests/bug37360.phpt
--TEST--
Bug #37360 (gdimagecreatefromgif, bad image sizes)
--SKIPIF--
?php
if (!extension_loaded('gd')) die(skip gd extension not available\n);
if (!GD_BUNDLED) die('skip external GD libraries always fail');
?
--FILE--
?php
$im = imagecreatefromgif(dirname(__FILE__) . '/bug37360.gif');
var_dump($im);
?
--EXPECTF--
resource(%d) of type (gd)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
pajoye Sun May 7 17:55:10 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - entry for #37346, invalid colormap format http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547r2=1.2027.2.548diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547 php-src/NEWS:1.2027.2.548 --- php-src/NEWS:1.2027.2.547 Fri May 5 07:05:34 2006 +++ php-src/NEWSSun May 7 17:55:10 2006 @@ -3,6 +3,7 @@ ?? ??? 2006, PHP 5.?.? - Fixed bug #37313 (sigemptyset() used without including signal.h). (jdolecek) +- Fixed bug #37346, invalid colormap format 04 May 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
pajoye Sun May 7 18:00:28 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - +() http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.548r2=1.2027.2.549diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.548 php-src/NEWS:1.2027.2.549 --- php-src/NEWS:1.2027.2.548 Sun May 7 17:55:10 2006 +++ php-src/NEWSSun May 7 18:00:28 2006 @@ -3,7 +3,7 @@ ?? ??? 2006, PHP 5.?.? - Fixed bug #37313 (sigemptyset() used without including signal.h). (jdolecek) -- Fixed bug #37346, invalid colormap format +- Fixed bug #37346 (invalid colormap format) 04 May 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /sapi/cgi fastcgi.c
dmitry Fri May 5 07:05:34 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/sapi/cgi fastcgi.c Log: Fixed bug #37313 (sigemptyset() used without including signal.h). (jdolecek) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.546r2=1.2027.2.547diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.546 php-src/NEWS:1.2027.2.547 --- php-src/NEWS:1.2027.2.546 Wed May 3 22:44:37 2006 +++ php-src/NEWSFri May 5 07:05:34 2006 @@ -1,5 +1,9 @@ PHPNEWS ||| +?? ??? 2006, PHP 5.?.? +- Fixed bug #37313 (sigemptyset() used without including signal.h). + (jdolecek) + 04 May 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options for SSL streams. (Wez). http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.12r2=1.4.2.13diff_format=u Index: php-src/sapi/cgi/fastcgi.c diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.12 php-src/sapi/cgi/fastcgi.c:1.4.2.13 --- php-src/sapi/cgi/fastcgi.c:1.4.2.12 Wed May 3 15:39:16 2006 +++ php-src/sapi/cgi/fastcgi.c Fri May 5 07:05:34 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: fastcgi.c,v 1.4.2.12 2006/05/03 15:39:16 dmitry Exp $ */ +/* $Id: fastcgi.c,v 1.4.2.13 2006/05/05 07:05:34 dmitry Exp $ */ #include fastcgi.h #include php.h @@ -69,7 +69,7 @@ # include netinet/in.h # include arpa/inet.h # include netdb.h -# include sys/signal.h +# include signal.h #ifndef INADDR_NONE #define INADDR_NONE ((unsigned long) -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_1) / NEWS /main php_variables.c
dmitry Wed May 3 11:24:29 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main php_variables.c
/php-srcNEWS
Log:
Fixed bug #37276 (problems witch $_POST array)
http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.104.2.9r2=1.104.2.10diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.104.2.9
php-src/main/php_variables.c:1.104.2.10
--- php-src/main/php_variables.c:1.104.2.9 Tue Apr 18 06:58:43 2006
+++ php-src/main/php_variables.cWed May 3 11:24:29 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.104.2.9 2006/04/18 06:58:43 dmitry Exp $ */
+/* $Id: php_variables.c,v 1.104.2.10 2006/05/03 11:24:29 dmitry Exp $ */
#include stdio.h
#include php.h
@@ -178,7 +178,7 @@
is_array = 1;
*ip = 0;
} else {
- is_array = 0;
+ goto plain_var;
}
}
} else {
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.542r2=1.2027.2.543diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.542 php-src/NEWS:1.2027.2.543
--- php-src/NEWS:1.2027.2.542 Wed May 3 08:44:32 2006
+++ php-src/NEWSWed May 3 11:24:29 2006
@@ -5,6 +5,7 @@
for SSL streams. (Wez).
- Fixed possible crash in highlight_string(). (Dmitry)
- Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob)
+- Fixed bug #37276 (problems witch $_POST array). (Dmitry)
- Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez).
- Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
dmitry Wed May 3 13:25:38 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.543r2=1.2027.2.544diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.543 php-src/NEWS:1.2027.2.544 --- php-src/NEWS:1.2027.2.543 Wed May 3 11:24:29 2006 +++ php-src/NEWSWed May 3 13:25:37 2006 @@ -4,6 +4,7 @@ - Added capture_peer_cert and capture_peer_cert_chain context options for SSL streams. (Wez). - Fixed possible crash in highlight_string(). (Dmitry) +- Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry) - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob) - Fixed bug #37276 (problems witch $_POST array). (Dmitry) - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
iliaa Wed May 3 13:32:46 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Prepare news file for release http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.544r2=1.2027.2.545diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.544 php-src/NEWS:1.2027.2.545 --- php-src/NEWS:1.2027.2.544 Wed May 3 13:25:37 2006 +++ php-src/NEWSWed May 3 13:32:46 2006 @@ -1,12 +1,12 @@ PHPNEWS ||| -?? ??? 2006, PHP 5.1.4 +04 May 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options for SSL streams. (Wez). - Fixed possible crash in highlight_string(). (Dmitry) - Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry) - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob) -- Fixed bug #37276 (problems witch $_POST array). (Dmitry) +- Fixed bug #37276 (problems with $_POST array). (Dmitry) - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez). - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez). -- 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_1) / NEWS
Please wait for at least several hours and let me test it first. I don't trust our core testers anymore, so please DO NOT release it right now. On 03.05.2006 17:32, Ilia Alshanetsky wrote: iliaa Wed May 3 13:32:46 2006 UTC Modified files: (Branch: PHP_5_1) /php-src NEWS Log: Prepare news file for release http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.544r2=1.2027.2.545diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.544 php-src/NEWS:1.2027.2.545 --- php-src/NEWS:1.2027.2.544 Wed May 3 13:25:37 2006 +++ php-src/NEWSWed May 3 13:32:46 2006 @@ -1,12 +1,12 @@ PHPNEWS ||| -?? ??? 2006, PHP 5.1.4 +04 May 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options for SSL streams. (Wez). - Fixed possible crash in highlight_string(). (Dmitry) - Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry) - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob) -- Fixed bug #37276 (problems witch $_POST array). (Dmitry) +- Fixed bug #37276 (problems with $_POST array). (Dmitry) - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez). - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez). -- 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(PHP_5_1) / NEWS
I will not tag the release untill 7-8pm EST time. On 3-May-06, at 9:49 AM, Antony Dovgal wrote: Please wait for at least several hours and let me test it first. I don't trust our core testers anymore, so please DO NOT release it right now. On 03.05.2006 17:32, Ilia Alshanetsky wrote: iliaa Wed May 3 13:32:46 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Prepare news file for release http://cvs.php.net/viewcvs.cgi/php-src/NEWS? r1=1.2027.2.544r2=1.2027.2.545diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.544 php-src/NEWS:1.2027.2.545 --- php-src/NEWS:1.2027.2.544 Wed May 3 13:25:37 2006 +++ php-src/NEWSWed May 3 13:32:46 2006 @@ -1,12 +1,12 @@ PHP NEWS | || -?? ??? 2006, PHP 5.1.4 +04 May 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options for SSL streams. (Wez). - Fixed possible crash in highlight_string(). (Dmitry) - Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry) - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob) -- Fixed bug #37276 (problems witch $_POST array). (Dmitry) +- Fixed bug #37276 (problems with $_POST array). (Dmitry) - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez). - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez). -- Wbr, Antony Dovgal Ilia Alshanetsky Advanced Internet Designs Inc. [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
pollita Wed May 3 22:44:37 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: News entry for exporting PDO::PARAM_EVT_* constants http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.545r2=1.2027.2.546diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.545 php-src/NEWS:1.2027.2.546 --- php-src/NEWS:1.2027.2.545 Wed May 3 13:32:46 2006 +++ php-src/NEWSWed May 3 22:44:37 2006 @@ -3,6 +3,7 @@ 04 May 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options for SSL streams. (Wez). +- Added PDO::PARAM_EVT_* family of constants. (Sara) - Fixed possible crash in highlight_string(). (Dmitry) - Fixed bug #37291 (FastCGI now longer works with isapi_fcgi.dll). (Dmitry) - Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
rrichards Wed May 3 08:44:32 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN re-order news http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.541r2=1.2027.2.542diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.541 php-src/NEWS:1.2027.2.542 --- php-src/NEWS:1.2027.2.541 Tue May 2 15:50:04 2006 +++ php-src/NEWSWed May 3 08:44:32 2006 @@ -4,8 +4,9 @@ - Added capture_peer_cert and capture_peer_cert_chain context options for SSL streams. (Wez). - Fixed possible crash in highlight_string(). (Dmitry) -- Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez). +- Fixed bug #37277 (cloning Dom Documents or Nodes does not work). (Rob) - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez). +- Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez). 28 Apr 2006, PHP 5.1.3 - Updated bundled PCRE library to version 6.6. (Andrei) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
dmitry Tue May 2 15:50:04 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: typo http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.540r2=1.2027.2.541diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.540 php-src/NEWS:1.2027.2.541 --- php-src/NEWS:1.2027.2.540 Mon May 1 01:10:33 2006 +++ php-src/NEWSTue May 2 15:50:04 2006 @@ -3,6 +3,7 @@ ?? ??? 2006, PHP 5.1.4 - Added capture_peer_cert and capture_peer_cert_chain context options for SSL streams. (Wez). +- Fixed possible crash in highlight_string(). (Dmitry) - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez). - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
helly Sun Apr 30 14:30:06 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - After 5.1.3 follows 5.1.4, 5.2 requires a new branch, preferable from this point of development (ilia will do so) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.538r2=1.2027.2.539diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.538 php-src/NEWS:1.2027.2.539 --- php-src/NEWS:1.2027.2.538 Sun Apr 30 01:27:33 2006 +++ php-src/NEWSSun Apr 30 14:30:05 2006 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2006, PHP 5.2.0 +?? ??? 2006, PHP 5.1.4 - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez). - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
wez Mon May 1 01:10:33 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: add note about ssl context options. http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.539r2=1.2027.2.540diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.539 php-src/NEWS:1.2027.2.540 --- php-src/NEWS:1.2027.2.539 Sun Apr 30 14:30:05 2006 +++ php-src/NEWSMon May 1 01:10:33 2006 @@ -1,6 +1,8 @@ PHPNEWS ||| ?? ??? 2006, PHP 5.1.4 +- Added capture_peer_cert and capture_peer_cert_chain context options + for SSL streams. (Wez). - Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez). - Fixed bug #36632 (bad error reporting for pdo_odbc exec UPDATE). (Wez). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/pdo_odbc odbc_driver.c
wez Sun Apr 30 00:52:29 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/pdo_odbc odbc_driver.c
Log:
Fix #35552
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.536r2=1.2027.2.537diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.536 php-src/NEWS:1.2027.2.537
--- php-src/NEWS:1.2027.2.536 Wed Apr 26 16:07:11 2006
+++ php-src/NEWSSun Apr 30 00:52:28 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2006, PHP 5.2.0
+- Fixed bug #35552 (crash when pdo_odbc prepare fails). (Wez).
28 Apr 2006, PHP 5.1.3
- Updated bundled PCRE library to version 6.6. (Andrei)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo_odbc/odbc_driver.c?r1=1.27.2.2r2=1.27.2.3diff_format=u
Index: php-src/ext/pdo_odbc/odbc_driver.c
diff -u php-src/ext/pdo_odbc/odbc_driver.c:1.27.2.2
php-src/ext/pdo_odbc/odbc_driver.c:1.27.2.3
--- php-src/ext/pdo_odbc/odbc_driver.c:1.27.2.2 Wed Dec 14 04:56:22 2005
+++ php-src/ext/pdo_odbc/odbc_driver.c Sun Apr 30 00:52:28 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: odbc_driver.c,v 1.27.2.2 2005/12/14 04:56:22 wez Exp $ */
+/* $Id: odbc_driver.c,v 1.27.2.3 2006/04/30 00:52:28 wez Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -198,13 +198,21 @@
efree(nsql);
}
+ stmt-driver_data = S;
+ stmt-methods = odbc_stmt_methods;
+
if (rc != SQL_SUCCESS) {
pdo_odbc_stmt_error(SQLPrepare);
+if (rc != SQL_SUCCESS_WITH_INFO) {
+/* clone error information into the db handle */
+strcpy(H-einfo.last_err_msg, S-einfo.last_err_msg);
+H-einfo.file = S-einfo.file;
+H-einfo.line = S-einfo.line;
+H-einfo.what = S-einfo.what;
+strcpy(dbh-error_code, stmt-error_code);
+}
}
- stmt-driver_data = S;
- stmt-methods = odbc_stmt_methods;
-
if (rc != SQL_SUCCESS rc != SQL_SUCCESS_WITH_INFO) {
return 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_1) / NEWS /sapi/cgi fastcgi.c
dmitry Wed Apr 26 11:08:10 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/sapi/cgi fastcgi.c
Log:
Fixed bug #37205 (Serving binary content/images fails with comm with server
aborted FastCGI err)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.531r2=1.2027.2.532diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.531 php-src/NEWS:1.2027.2.532
--- php-src/NEWS:1.2027.2.531 Tue Apr 25 08:43:29 2006
+++ php-src/NEWSWed Apr 26 11:08:10 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Apr 2006, PHP 5.1.3RC4
+- Fixed bug #37205 (Serving binary content/images fails with comm with server
+ aborted FastCGI err). (Dmitry)
- Fixed bug #37192 (cc may complain about non-constant initializers in
hash_adler.c). (Mike)
- Fixed bug #37191 (chmod takes off sticky bit when safe_mode is On). (Tony)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.7r2=1.4.2.8diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.7 php-src/sapi/cgi/fastcgi.c:1.4.2.8
--- php-src/sapi/cgi/fastcgi.c:1.4.2.7 Mon Apr 24 09:53:57 2006
+++ php-src/sapi/cgi/fastcgi.c Wed Apr 26 11:08:10 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.7 2006/04/24 09:53:57 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.8 2006/04/26 11:08:10 dmitry Exp $ */
#include fastcgi.h
#include php.h
@@ -618,8 +618,12 @@
RevertToSelf();
}
#else
+#if 1
+ shutdown(req-fd, 2);
+#else
close(req-fd);
#endif
+#endif
req-fd = -1;
}
}
@@ -814,16 +818,30 @@
memcpy(req-out_pos, str + limit, len - limit);
req-out_pos += len - limit;
} else {
- int pad = ((len + 7) ~7) - len;
+ int pos = 0;
+ int pad;
+ close_packet(req);
+ while ((len - pos) 0x) {
+ open_packet(req, type);
+ fcgi_make_header(req-out_hdr, type, req-id, 0xfff8);
+ req-out_hdr = NULL;
+ fcgi_flush(req, 0);
+ if (safe_write(req, str + pos, 0xfff8) != 0xfff8) {
+ req-keep = 0;
+ return -1;
+ }
+ pos += 0xfff8;
+ }
+
+ pad = (((len - pos) + 7) ~7) - (len - pos);
rest = pad ? 8 - pad : 0;
- close_packet(req);
open_packet(req, type);
- fcgi_make_header(req-out_hdr, type, req-id, len - rest);
+ fcgi_make_header(req-out_hdr, type, req-id, (len - pos) -
rest);
req-out_hdr = NULL;
fcgi_flush(req, 0);
- if (safe_write(req, str, len - rest) != len - rest) {
+ if (safe_write(req, str + pos, (len - pos) - rest) != (len -
pos) - rest) {
req-keep = 0;
return -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_1) / NEWS
iliaa Wed Apr 26 13:56:58 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Prepare the news file for release http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.532r2=1.2027.2.533diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.532 php-src/NEWS:1.2027.2.533 --- php-src/NEWS:1.2027.2.532 Wed Apr 26 11:08:10 2006 +++ php-src/NEWSWed Apr 26 13:56:57 2006 @@ -1,28 +1,92 @@ PHPNEWS ||| -?? Apr 2006, PHP 5.1.3RC4 -- Fixed bug #37205 (Serving binary content/images fails with comm with server +27 Apr 2006, PHP 5.1.3 +- Updated bundled PCRE library to version 6.6. (Andrei) +- Moved extensions to PECL: + . ext/msession (Derick) +- Reimplemented FastCGI interface. (Dmitry) +- Improved SPL: (Marcus) + - Fixed issues with not/double calling of constructors of SPL iterators. + - Fixed issues with info-class/file-class in SPL directory handling classes. + - Fixed ArrayIterator::seek(). + - Added SimpleXMLIterator::count(). + - Dropped erroneous RecursiveDirectoryIterator::getSubPathInfo(). +- Improved SimpleXML: (Marcus, Rob) + . Added SimpleXMLElement::getName() to retrieve name of element. + . Added ability to create elements on the fly. + . Added addChild() method for element creation supporting namespaces. + . Added addAttribute() method for attribute creation supporting namespaces. + . Added ability to delete specific elements and attributes by offset. +- Improved Reflection API: (Marcus) + . Added ReflectionClass::newInstanceArgs($args). + . Added ability to analyze extension dependency. + . Added ReflectionFunction::isDeprecated() and constant IS_DEPRECATED. + . Added ReflectionParameter::getDeclaringClass(). + . Changed reflection constants to be prefixed with IS_. (Johannes) +- Improved cURL extension: (Ilia) + . Added curl_setopt_array() function that allows setting of multiple +options via an associated array. + . Added the ability to retrieve the request message sent to the server. +- Improved GD extension: (Pierre) + . Added a weak/tolerant mode to the JPEG loader. + . Added filtering mode option to imagepng() to allow reducing file size. + . Fixed imagecolorallocate() and imagecolorallocatelapha() to return FALSE +on error. +- Changed get_headers() to retrieve headers also from non-200 responses. + (Ilia) +- Changed get_headers() to use the default context. (Ilia) +- Changed SOAP extension to cache WSDL structure in memory and thus speed + up SoapClient/SoapServer construction. (Andrei, Dmitry) +- Added lchown() and lchgrp() to change user/group ownership of symlinks. + (Derick) +- Added support for exif date format in strtotime(). (Derick) +- Added a check for special characters in the session name. (Ilia) +- Added consumed stream filter. (Marcus) +- Added new mysqli constants for BIT and NEW_DECIMAL field types: + MYSQLI_TYPE_NEWDECIMAL and MYSQLI_TYPE_BIT. FR #36007. (Georg) +- Added imap_savebody() that allows message body to be written to a + file. (Mike) +- Added overflow checks to wordwrap() function. (Ilia) +- Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8 + (also fixes bug #36764). (Tony) +- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) +- Removed the E_STRICT deprecation notice from var. (Ilia) +- Fixed reading stream filters never notified about EOF. (Mike) +- Fixed tempnam() 2nd parameter to be checked against path components. (Ilia) +- Fixed a bug that would not fill in the fifth argument to preg_replace() + properly, if the variable was not declared previously. (Andrei) +- Fixed safe_mode check for source argument of the copy() function. (Ilia) +- Fixed mysqli bigint conversion under Windows (Georg) +- Fixed XSS inside phpinfo() with long inputs. (Ilia) +- Fixed Apache2 SAPIs header handler modifying header strings. (Mike) +- Fixed 'auto_globals_jit' to work together with 'register_argc_argv'. (Dmitry) +- Fixed offset/length parameter validation in substr_compare() function. (Ilia) +- Fixed debug_zval_dump() to support private and protected members. (Dmitry) +- Fixed SoapFault::getMessage(). (Dmitry) +- Fixed issue with iconv_mime_decode where the encoding would only allow + upper case specifiers. (Derick) +- Fixed tiger hash algorithm generating wrong results on big endian platforms. + (Mike) +- Fixed crash with DOMImplementation::createDocumentType(name:). (Mike) +- Fixed bug #37205 (Serving binary content/images fails with comm with server aborted FastCGI err). (Dmitry) -- Fixed bug #37192 (cc may complain about non-constant initializers in +- Fixed bug #37192 (cc may complain about non-constant initializers in hash_adler.c). (Mike) -- Fixed bug #37191 (chmod takes off sticky bit when safe_mode is On). (Tony) - -20 Apr 2006, PHP 5.1.3RC3 -- Fixed reading
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
edink Wed Apr 26 14:23:51 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.533r2=1.2027.2.534diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.533 php-src/NEWS:1.2027.2.534 --- php-src/NEWS:1.2027.2.533 Wed Apr 26 13:56:57 2006 +++ php-src/NEWSWed Apr 26 14:23:51 2006 @@ -256,6 +256,7 @@ (Ilia) - Fixed bug #35785 (SimpleXML causes memory read error zend engine). (Marcus) - Fixed bug #34272 (empty array onto COM object blows up). (Rob) +- Fixed bug #33292 (apache_get_modules() crashes on Windows). (Edin) - Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever). (Ilia) -- 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_1) / NEWS
Wasn't SOAP cache left out in 5.1.3? Also I just added a NEWS entry, sorry for that :) Should I move the tag if you didn't already make tarballs? Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
iliaa Wed Apr 26 14:31:33 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Remove soap cache news http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.534r2=1.2027.2.535diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.534 php-src/NEWS:1.2027.2.535 --- php-src/NEWS:1.2027.2.534 Wed Apr 26 14:23:51 2006 +++ php-src/NEWSWed Apr 26 14:31:33 2006 @@ -35,8 +35,6 @@ - Changed get_headers() to retrieve headers also from non-200 responses. (Ilia) - Changed get_headers() to use the default context. (Ilia) -- Changed SOAP extension to cache WSDL structure in memory and thus speed - up SoapClient/SoapServer construction. (Andrei, Dmitry) - Added lchown() and lchgrp() to change user/group ownership of symlinks. (Derick) - Added support for exif date format in strtotime(). (Derick) @@ -82,8 +80,6 @@ - Fixed bug #37138 (__autoload tries to load callback'ed self and parent). (Dmitry) - Fixed bug #37103 (libmbfl headers not installed). (Jani) -- Fixed bug #37083 (Frequent crashes in SOAP extension with new WSDL caching - code in multithread WS). (Andrei, Dmitry) - Fixed bug #37062 (compile failure on ARM architecture). (Tony) - Fixed bug #37061 (curl_exec() doesn't zero-terminate binary strings). (Tony) - Fixed bug #37060 (Type of retval of Countable::count() is not checked). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
iliaa Wed Apr 26 16:07:11 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/main php_version.h /php-srcconfigure.in NEWS Log: Restore dev http://cvs.php.net/viewcvs.cgi/php-src/main/php_version.h?r1=1.112.2.34r2=1.112.2.35diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.34 php-src/main/php_version.h:1.112.2.35 --- php-src/main/php_version.h:1.112.2.34 Wed Apr 26 14:08:26 2006 +++ php-src/main/php_version.h Wed Apr 26 16:07:11 2006 @@ -1,7 +1,7 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 -#define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 3 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.1.3 +#define PHP_MINOR_VERSION 2 +#define PHP_RELEASE_VERSION 0 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.2.0-dev http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.49r2=1.579.2.50diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.49 php-src/configure.in:1.579.2.50 --- php-src/configure.in:1.579.2.49 Wed Apr 26 14:08:26 2006 +++ php-src/configure.inWed Apr 26 16:07:11 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.49 2006/04/26 14:08:26 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.50 2006/04/26 16:07:11 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -40,9 +40,9 @@ AC_CONFIG_HEADER(main/php_config.h) MAJOR_VERSION=5 -MINOR_VERSION=1 -RELEASE_VERSION=3 -EXTRA_VERSION= +MINOR_VERSION=2 +RELEASE_VERSION=0 +EXTRA_VERSION=-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.535r2=1.2027.2.536diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.535 php-src/NEWS:1.2027.2.536 --- php-src/NEWS:1.2027.2.535 Wed Apr 26 14:31:33 2006 +++ php-src/NEWSWed Apr 26 16:07:11 2006 @@ -1,6 +1,8 @@ PHPNEWS ||| -27 Apr 2006, PHP 5.1.3 +?? ??? 2006, PHP 5.2.0 + +28 Apr 2006, PHP 5.1.3 - Updated bundled PCRE library to version 6.6. (Andrei) - Moved extensions to PECL: . ext/msession (Derick) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/hash hash_adler32.c
mikeTue Apr 25 08:34:26 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/hash hash_adler32.c
/php-srcNEWS
Log:
- Fixed bug #37192 (cc fails on hash_adler.c:32)
http://cvs.php.net/viewcvs.cgi/php-src/ext/hash/hash_adler32.c?r1=1.3.2.3r2=1.3.2.4diff_format=u
Index: php-src/ext/hash/hash_adler32.c
diff -u php-src/ext/hash/hash_adler32.c:1.3.2.3
php-src/ext/hash/hash_adler32.c:1.3.2.4
--- php-src/ext/hash/hash_adler32.c:1.3.2.3 Sun Jan 1 12:50:07 2006
+++ php-src/ext/hash/hash_adler32.c Tue Apr 25 08:34:25 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: hash_adler32.c,v 1.3.2.3 2006/01/01 12:50:07 sniper Exp $ */
+/* $Id: hash_adler32.c,v 1.3.2.4 2006/04/25 08:34:25 mike Exp $ */
#include php_hash.h
#include php_hash_adler32.h
@@ -29,8 +29,10 @@
PHP_HASH_API void PHP_ADLER32Update(PHP_ADLER32_CTX *context, const unsigned
char *input, size_t len)
{
- php_hash_uint32 i, s[2] = { context-state 0x, (context-state
16) 0x };
+ php_hash_uint32 i, s[2];
+ s[0] = context-state 0x;
+ s[1] = (context-state 16) 0x;
for (i = 0; i len; ++i) {
s[0] = (s[0] + input[i]) % 65521;
s[1] = (s[1] + s[0]) % 65521;
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.528r2=1.2027.2.529diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.528 php-src/NEWS:1.2027.2.529
--- php-src/NEWS:1.2027.2.528 Sun Apr 23 16:40:05 2006
+++ php-src/NEWSTue Apr 25 08:34:25 2006
@@ -1,5 +1,8 @@
PHPNEWS
|||
+?? Apr 2006, PHP 5.1.3RC4
+- Fixed bug #37192 (cc fails on hash_adler.c:32). Mike
+
20 Apr 2006, PHP 5.1.3RC3
- Fixed reading stream filters never notified about EOF. (Mike)
- Fixed bug #37167 (PDO segfaults when throwing exception from the fetch
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard filestat.c
tony2001Tue Apr 25 08:41:02 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard filestat.c
/php-srcNEWS
Log:
fix #37191 (chmod takes off sticky bit when safe_mode is On)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.7r2=1.136.2.8diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.7
php-src/ext/standard/filestat.c:1.136.2.8
--- php-src/ext/standard/filestat.c:1.136.2.7 Mon Apr 10 11:56:18 2006
+++ php-src/ext/standard/filestat.c Tue Apr 25 08:41:02 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.136.2.7 2006/04/10 11:56:18 sniper Exp $ */
+/* $Id: filestat.c,v 1.136.2.8 2006/04/25 08:41:02 tony2001 Exp $ */
#include php.h
#include safe_mode.h
@@ -504,8 +504,23 @@
Setuiding files could allow users to gain privileges
that safe mode doesn't give them.
*/
- if(PG(safe_mode))
- imode = 0777;
+
+ if(PG(safe_mode)) {
+ php_stream_statbuf ssb;
+ if (php_stream_stat_path_ex(Z_STRVAL_PP(filename), 0, ssb,
NULL)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, stat
failed for %s, Z_STRVAL_PP(filename));
+ RETURN_FALSE;
+ }
+ if ((imode 04000) != 0 (ssb.sb.st_mode 04000) == 0) {
+ imode ^= 04000;
+ }
+ if ((imode 02000) != 0 (ssb.sb.st_mode 02000) == 0) {
+ imode ^= 02000;
+ }
+ if ((imode 01000) != 0 (ssb.sb.st_mode 01000) == 0) {
+ imode ^= 01000;
+ }
+ }
ret = VCWD_CHMOD(Z_STRVAL_PP(filename), imode);
if (ret == -1) {
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.529r2=1.2027.2.530diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.529 php-src/NEWS:1.2027.2.530
--- php-src/NEWS:1.2027.2.529 Tue Apr 25 08:34:25 2006
+++ php-src/NEWSTue Apr 25 08:41:02 2006
@@ -1,7 +1,8 @@
PHPNEWS
|||
?? Apr 2006, PHP 5.1.3RC4
-- Fixed bug #37192 (cc fails on hash_adler.c:32). Mike
+- Fixed bug #37192 (cc fails on hash_adler.c:32). (Mike)
+- Fixed bug #37191 (chmod takes off sticky bit when safe_mode is On). (Tony)
20 Apr 2006, PHP 5.1.3RC3
- Fixed reading stream filters never notified about EOF. (Mike)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
mikeTue Apr 25 08:43:29 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: -improve last entry http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.530r2=1.2027.2.531diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.530 php-src/NEWS:1.2027.2.531 --- php-src/NEWS:1.2027.2.530 Tue Apr 25 08:41:02 2006 +++ php-src/NEWSTue Apr 25 08:43:29 2006 @@ -1,7 +1,8 @@ PHPNEWS ||| ?? Apr 2006, PHP 5.1.3RC4 -- Fixed bug #37192 (cc fails on hash_adler.c:32). (Mike) +- Fixed bug #37192 (cc may complain about non-constant initializers in + hash_adler.c). (Mike) - Fixed bug #37191 (chmod takes off sticky bit when safe_mode is On). (Tony) 20 Apr 2006, PHP 5.1.3RC3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/wddx wddx.c
iliaa Sun Apr 23 16:02:06 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/wddx wddx.c /php-srcNEWS Log: Fixed bug #37162 (wddx does not build as a shared extension). #Patch By: jdolecek at NetBSD dot org http://cvs.php.net/viewcvs.cgi/php-src/ext/wddx/wddx.c?r1=1.119.2.9r2=1.119.2.10diff_format=u Index: php-src/ext/wddx/wddx.c diff -u php-src/ext/wddx/wddx.c:1.119.2.9 php-src/ext/wddx/wddx.c:1.119.2.10 --- php-src/ext/wddx/wddx.c:1.119.2.9 Sat Jan 28 06:15:25 2006 +++ php-src/ext/wddx/wddx.c Sun Apr 23 16:02:05 2006 @@ -16,7 +16,11 @@ +--+ */ -/* $Id: wddx.c,v 1.119.2.9 2006/01/28 06:15:25 fmk Exp $ */ +/* $Id: wddx.c,v 1.119.2.10 2006/04/23 16:02:05 iliaa Exp $ */ + +#ifdef HAVE_CONFIG_H +#include config.h +#endif #include php.h http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.526r2=1.2027.2.527diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.526 php-src/NEWS:1.2027.2.527 --- php-src/NEWS:1.2027.2.526 Sat Apr 22 19:16:36 2006 +++ php-src/NEWSSun Apr 23 16:02:05 2006 @@ -4,6 +4,8 @@ - Fixed reading stream filters never notified about EOF. (Mike) - Fixed bug #37167 (PDO segfaults when throwing exception from the fetch handler). (Tony) +- Fixed bug #37162 (wddx does not build as a shared extension). + (jdolecek at NetBSD dot org, Ilia) - Fixed bug #37158 (fread behaviour changes after calling stream_wrapper_register). (Wez) - Fixed bug #37138 (__autoload tries to load callback'ed self and parent). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
iliaa Sun Apr 23 16:40:05 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Fixed typos http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.527r2=1.2027.2.528diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.527 php-src/NEWS:1.2027.2.528 --- php-src/NEWS:1.2027.2.527 Sun Apr 23 16:02:05 2006 +++ php-src/NEWSSun Apr 23 16:40:05 2006 @@ -6,18 +6,18 @@ handler). (Tony) - Fixed bug #37162 (wddx does not build as a shared extension). (jdolecek at NetBSD dot org, Ilia) -- Fixed bug #37158 (fread behaviour changes after calling +- Fixed bug #37158 (fread behavior changes after calling stream_wrapper_register). (Wez) - Fixed bug #37138 (__autoload tries to load callback'ed self and parent). (Dmitry) - Fixed bug #37103 (libmbfl headers not installed). (Jani) -- Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching +- Fixed bug #37083 (Frequent crashes in SOAP extension with new WSDL caching code in multithread WS). (Andrei, Dmitry) - Fixed bug #37062 (compile failure on ARM architecture). (Tony) - Fixed bug #37061 (curl_exec() doesn't zero-terminate binary strings). (Tony) - Fixed bug #37060 (Type of retval of Countable::count() is not checked). (Johannes) -- FIxed bug #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW +- Fixed bug #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW fields). (Tony) - Fixed bug #37057 (xmlrpc_decode() may produce arrays with numeric strings, which are unaccessible). (Tony) @@ -32,7 +32,7 @@ vars). (Dmitry) - Fixed Bug #36872 (session_destroy() fails after call to session_regenerate_id(true)). (Ilia) -- Fixed bug #36513 (comment will be outputed in last line). (Dmitry) +- Fixed bug #36513 (comment will be outputted in last line). (Dmitry) - Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main/streams php_streams_int.h streams.c userspace.c
wez Sat Apr 22 17:17:40 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/main/streams php_streams_int.h streams.c userspace.c
Log:
fix for #37158
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.524r2=1.2027.2.525diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.524 php-src/NEWS:1.2027.2.525
--- php-src/NEWS:1.2027.2.524 Thu Apr 20 21:11:29 2006
+++ php-src/NEWSSat Apr 22 17:17:40 2006
@@ -2,6 +2,8 @@
|||
20 Apr 2006, PHP 5.1.3RC3
- Fixed reading stream filters never notified about EOF. (Mike)
+- Fixed bug #37158 (fread behaviour changes after calling
+ stream_wrapper_register). (Wez)
- Fixed bug #37138 (__autoload tries to load callback'ed self and parent).
(Dmitry)
- Fixed bug #37103 (libmbfl headers not installed). (Jani)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/php_streams_int.h?r1=1.7.2.1r2=1.7.2.2diff_format=u
Index: php-src/main/streams/php_streams_int.h
diff -u php-src/main/streams/php_streams_int.h:1.7.2.1
php-src/main/streams/php_streams_int.h:1.7.2.2
--- php-src/main/streams/php_streams_int.h:1.7.2.1 Sun Jan 1 12:50:18 2006
+++ php-src/main/streams/php_streams_int.h Sat Apr 22 17:17:40 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams_int.h,v 1.7.2.1 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: php_streams_int.h,v 1.7.2.2 2006/04/22 17:17:40 wez Exp $ */
#if ZEND_DEBUG
@@ -46,7 +46,6 @@
#define STREAM_DEBUG 0
#define STREAM_WRAPPER_PLAIN_FILES ((php_stream_wrapper*)-1)
-extern php_stream_wrapper php_plain_files_wrapper;
#ifndef MAP_FAILED
#define MAP_FAILED ((void *) -1)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.82.2.5r2=1.82.2.6diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.5
php-src/main/streams/streams.c:1.82.2.6
--- php-src/main/streams/streams.c:1.82.2.5 Thu Apr 20 17:43:18 2006
+++ php-src/main/streams/streams.c Sat Apr 22 17:17:40 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.5 2006/04/20 17:43:18 mike Exp $ */
+/* $Id: streams.c,v 1.82.2.6 2006/04/22 17:17:40 wez Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1457,7 +1457,7 @@
return FAILURE;
}
- return zend_hash_add(url_stream_wrappers_hash, protocol, protocol_len,
wrapper, sizeof(*wrapper), NULL);
+ return zend_hash_add(url_stream_wrappers_hash, protocol, protocol_len,
wrapper, sizeof(wrapper), NULL);
}
PHPAPI int php_unregister_url_stream_wrapper(char *protocol TSRMLS_DC)
@@ -1465,6 +1465,15 @@
return zend_hash_del(url_stream_wrappers_hash, protocol,
strlen(protocol));
}
+static void clone_wrapper_hash(TSRMLS_D)
+{
+ php_stream_wrapper *tmp;
+
+ ALLOC_HASHTABLE(FG(stream_wrappers));
+ zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
+ zend_hash_copy(FG(stream_wrappers), url_stream_wrappers_hash, NULL,
tmp, sizeof(tmp));
+}
+
/* API for registering VOLATILE wrappers */
PHPAPI int php_register_url_stream_wrapper_volatile(char *protocol,
php_stream_wrapper *wrapper TSRMLS_DC)
{
@@ -1475,24 +1484,16 @@
}
if (!FG(stream_wrappers)) {
- php_stream_wrapper tmpwrapper;
-
- ALLOC_HASHTABLE(FG(stream_wrappers));
- zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
- zend_hash_copy(FG(stream_wrappers), url_stream_wrappers_hash,
NULL, tmpwrapper, sizeof(php_stream_wrapper));
+ clone_wrapper_hash(TSRMLS_C);
}
- return zend_hash_add(FG(stream_wrappers), protocol, protocol_len,
wrapper, sizeof(*wrapper), NULL);
+ return zend_hash_add(FG(stream_wrappers), protocol, protocol_len,
wrapper, sizeof(wrapper), NULL);
}
PHPAPI int php_unregister_url_stream_wrapper_volatile(char *protocol TSRMLS_DC)
{
if (!FG(stream_wrappers)) {
- php_stream_wrapper tmpwrapper;
-
- ALLOC_HASHTABLE(FG(stream_wrappers));
- zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
- zend_hash_copy(FG(stream_wrappers), url_stream_wrappers_hash,
NULL, tmpwrapper, sizeof(php_stream_wrapper));
+ clone_wrapper_hash(TSRMLS_C);
}
return zend_hash_del(FG(stream_wrappers), protocol, strlen(protocol));
@@ -1503,7 +1504,7 @@
PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path,
char **path_for_open, int options TSRMLS_DC)
{
HashTable *wrapper_hash = (FG(stream_wrappers) ? FG(stream_wrappers) :
url_stream_wrappers_hash);
- php_stream_wrapper *wrapper = NULL;
+ php_stream_wrapper **wrapperpp = NULL;
const char *p, *protocol = NULL;
int n = 0;
@@ -1529,7
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main/streams php_streams_int.h streams.c userspace.c
MFB? Or HEAD doesn't need this patch?
On 22.04.2006 21:17, Wez Furlong wrote:
wez Sat Apr 22 17:17:40 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/main/streams php_streams_int.h streams.c userspace.c
Log:
fix for #37158
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.524r2=1.2027.2.525diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.524 php-src/NEWS:1.2027.2.525
--- php-src/NEWS:1.2027.2.524 Thu Apr 20 21:11:29 2006
+++ php-src/NEWSSat Apr 22 17:17:40 2006
@@ -2,6 +2,8 @@
|||
20 Apr 2006, PHP 5.1.3RC3
- Fixed reading stream filters never notified about EOF. (Mike)
+- Fixed bug #37158 (fread behaviour changes after calling
+ stream_wrapper_register). (Wez)
- Fixed bug #37138 (__autoload tries to load callback'ed self and parent).
(Dmitry)
- Fixed bug #37103 (libmbfl headers not installed). (Jani)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/php_streams_int.h?r1=1.7.2.1r2=1.7.2.2diff_format=u
Index: php-src/main/streams/php_streams_int.h
diff -u php-src/main/streams/php_streams_int.h:1.7.2.1
php-src/main/streams/php_streams_int.h:1.7.2.2
--- php-src/main/streams/php_streams_int.h:1.7.2.1 Sun Jan 1 12:50:18 2006
+++ php-src/main/streams/php_streams_int.h Sat Apr 22 17:17:40 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams_int.h,v 1.7.2.1 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: php_streams_int.h,v 1.7.2.2 2006/04/22 17:17:40 wez Exp $ */
#if ZEND_DEBUG
@@ -46,7 +46,6 @@
#define STREAM_DEBUG 0
#define STREAM_WRAPPER_PLAIN_FILES ((php_stream_wrapper*)-1)
-extern php_stream_wrapper php_plain_files_wrapper;
#ifndef MAP_FAILED
#define MAP_FAILED ((void *) -1)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.82.2.5r2=1.82.2.6diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.5
php-src/main/streams/streams.c:1.82.2.6
--- php-src/main/streams/streams.c:1.82.2.5 Thu Apr 20 17:43:18 2006
+++ php-src/main/streams/streams.c Sat Apr 22 17:17:40 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.5 2006/04/20 17:43:18 mike Exp $ */
+/* $Id: streams.c,v 1.82.2.6 2006/04/22 17:17:40 wez Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1457,7 +1457,7 @@
return FAILURE;
}
- return zend_hash_add(url_stream_wrappers_hash, protocol, protocol_len, wrapper, sizeof(*wrapper), NULL);
+ return zend_hash_add(url_stream_wrappers_hash, protocol, protocol_len,
wrapper, sizeof(wrapper), NULL);
}
PHPAPI int php_unregister_url_stream_wrapper(char *protocol TSRMLS_DC)
@@ -1465,6 +1465,15 @@
return zend_hash_del(url_stream_wrappers_hash, protocol,
strlen(protocol));
}
+static void clone_wrapper_hash(TSRMLS_D)
+{
+ php_stream_wrapper *tmp;
+
+ ALLOC_HASHTABLE(FG(stream_wrappers));
+ zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
+ zend_hash_copy(FG(stream_wrappers), url_stream_wrappers_hash, NULL,
tmp, sizeof(tmp));
+}
+
/* API for registering VOLATILE wrappers */
PHPAPI int php_register_url_stream_wrapper_volatile(char *protocol,
php_stream_wrapper *wrapper TSRMLS_DC)
{
@@ -1475,24 +1484,16 @@
}
if (!FG(stream_wrappers)) {
- php_stream_wrapper tmpwrapper;
-
- ALLOC_HASHTABLE(FG(stream_wrappers));
- zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
- zend_hash_copy(FG(stream_wrappers), url_stream_wrappers_hash,
NULL, tmpwrapper, sizeof(php_stream_wrapper));
+ clone_wrapper_hash(TSRMLS_C);
}
- return zend_hash_add(FG(stream_wrappers), protocol, protocol_len, wrapper, sizeof(*wrapper), NULL);
+ return zend_hash_add(FG(stream_wrappers), protocol, protocol_len,
wrapper, sizeof(wrapper), NULL);
}
PHPAPI int php_unregister_url_stream_wrapper_volatile(char *protocol TSRMLS_DC)
{
if (!FG(stream_wrappers)) {
- php_stream_wrapper tmpwrapper;
-
- ALLOC_HASHTABLE(FG(stream_wrappers));
- zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
- zend_hash_copy(FG(stream_wrappers), url_stream_wrappers_hash,
NULL, tmpwrapper, sizeof(php_stream_wrapper));
+ clone_wrapper_hash(TSRMLS_C);
}
return zend_hash_del(FG(stream_wrappers), protocol, strlen(protocol));
@@ -1503,7 +1504,7 @@
PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char *path,
char **path_for_open, int options TSRMLS_DC)
{
HashTable *wrapper_hash = (FG(stream_wrappers) ? FG(stream_wrappers) :
url_stream_wrappers_hash);
- php_stream_wrapper *wrapper = NULL;
+ php_stream_wrapper **wrapperpp = NULL;
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main/streams php_streams_int.h streams.c userspace.c
Yeah, it should probably be merged to head.
--Wez.
Antony Dovgal wrote:
MFB? Or HEAD doesn't need this patch?
On 22.04.2006 21:17, Wez Furlong wrote:
wezSat Apr 22 17:17:40 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS /php-src/main/streamsphp_streams_int.h
streams.c userspace.c Log:
fix for #37158
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.524r2=1.2027.2.525diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.524 php-src/NEWS:1.2027.2.525
--- php-src/NEWS:1.2027.2.524Thu Apr 20 21:11:29 2006
+++ php-src/NEWSSat Apr 22 17:17:40 2006
@@ -2,6 +2,8 @@
|||
20 Apr 2006, PHP 5.1.3RC3
- Fixed reading stream filters never notified about EOF. (Mike)
+- Fixed bug #37158 (fread behaviour changes after calling
+ stream_wrapper_register). (Wez)
- Fixed bug #37138 (__autoload tries to load callback'ed self and
parent).
(Dmitry)
- Fixed bug #37103 (libmbfl headers not installed). (Jani)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/php_streams_int.h?r1=1.7.2.1r2=1.7.2.2diff_format=u
Index: php-src/main/streams/php_streams_int.h
diff -u php-src/main/streams/php_streams_int.h:1.7.2.1
php-src/main/streams/php_streams_int.h:1.7.2.2
--- php-src/main/streams/php_streams_int.h:1.7.2.1Sun Jan 1
12:50:18 2006
+++ php-src/main/streams/php_streams_int.hSat Apr 22 17:17:40 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams_int.h,v 1.7.2.1 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: php_streams_int.h,v 1.7.2.2 2006/04/22 17:17:40 wez Exp $ */
#if ZEND_DEBUG
@@ -46,7 +46,6 @@
#define STREAM_DEBUG 0
#define STREAM_WRAPPER_PLAIN_FILES((php_stream_wrapper*)-1)
-extern php_stream_wrapper php_plain_files_wrapper;
#ifndef MAP_FAILED
#define MAP_FAILED ((void *) -1)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.82.2.5r2=1.82.2.6diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.5
php-src/main/streams/streams.c:1.82.2.6
--- php-src/main/streams/streams.c:1.82.2.5Thu Apr 20 17:43:18 2006
+++ php-src/main/streams/streams.cSat Apr 22 17:17:40 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.5 2006/04/20 17:43:18 mike Exp $ */
+/* $Id: streams.c,v 1.82.2.6 2006/04/22 17:17:40 wez Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1457,7 +1457,7 @@
return FAILURE;
}
-return zend_hash_add(url_stream_wrappers_hash, protocol,
protocol_len, wrapper, sizeof(*wrapper), NULL);
+return zend_hash_add(url_stream_wrappers_hash, protocol,
protocol_len, wrapper, sizeof(wrapper), NULL);
}
PHPAPI int php_unregister_url_stream_wrapper(char *protocol TSRMLS_DC)
@@ -1465,6 +1465,15 @@
return zend_hash_del(url_stream_wrappers_hash, protocol,
strlen(protocol));
}
+static void clone_wrapper_hash(TSRMLS_D)
+{
+php_stream_wrapper *tmp;
+
+ALLOC_HASHTABLE(FG(stream_wrappers));
+zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
+zend_hash_copy(FG(stream_wrappers), url_stream_wrappers_hash,
NULL, tmp, sizeof(tmp));
+}
+
/* API for registering VOLATILE wrappers */
PHPAPI int php_register_url_stream_wrapper_volatile(char *protocol,
php_stream_wrapper *wrapper TSRMLS_DC)
{
@@ -1475,24 +1484,16 @@
}
if (!FG(stream_wrappers)) {
-php_stream_wrapper tmpwrapper;
-
-ALLOC_HASHTABLE(FG(stream_wrappers));
-zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
-zend_hash_copy(FG(stream_wrappers),
url_stream_wrappers_hash, NULL, tmpwrapper,
sizeof(php_stream_wrapper));
+clone_wrapper_hash(TSRMLS_C);
}
-return zend_hash_add(FG(stream_wrappers), protocol, protocol_len,
wrapper, sizeof(*wrapper), NULL);
+return zend_hash_add(FG(stream_wrappers), protocol, protocol_len,
wrapper, sizeof(wrapper), NULL);
}
PHPAPI int php_unregister_url_stream_wrapper_volatile(char *protocol
TSRMLS_DC)
{
if (!FG(stream_wrappers)) {
-php_stream_wrapper tmpwrapper;
-
-ALLOC_HASHTABLE(FG(stream_wrappers));
-zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
-zend_hash_copy(FG(stream_wrappers),
url_stream_wrappers_hash, NULL, tmpwrapper,
sizeof(php_stream_wrapper));
+clone_wrapper_hash(TSRMLS_C);
}
return zend_hash_del(FG(stream_wrappers), protocol,
strlen(protocol));
@@ -1503,7 +1504,7 @@
PHPAPI php_stream_wrapper *php_stream_locate_url_wrapper(const char
*path, char **path_for_open, int options TSRMLS_DC)
{
HashTable *wrapper_hash = (FG(stream_wrappers) ?
FG(stream_wrappers) : url_stream_wrappers_hash);
-php_stream_wrapper
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
tony2001Sat Apr 22 19:16:37 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.525r2=1.2027.2.526diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.525 php-src/NEWS:1.2027.2.526 --- php-src/NEWS:1.2027.2.525 Sat Apr 22 17:17:40 2006 +++ php-src/NEWSSat Apr 22 19:16:36 2006 @@ -2,6 +2,8 @@ ||| 20 Apr 2006, PHP 5.1.3RC3 - Fixed reading stream filters never notified about EOF. (Mike) +- Fixed bug #37167 (PDO segfaults when throwing exception from the fetch + handler). (Tony) - Fixed bug #37158 (fread behaviour changes after calling stream_wrapper_register). (Wez) - Fixed bug #37138 (__autoload tries to load callback'ed self and parent). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard/tests/filters read.phpt /main/streams streams.c
mikeThu Apr 20 17:43:18 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/standard/tests/filters read.phpt
Modified files:
/php-src/main/streams streams.c
/php-srcNEWS
Log:
- Fix reading stream filters never notified about EOF
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.82.2.4r2=1.82.2.5diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.82.2.4
php-src/main/streams/streams.c:1.82.2.5
--- php-src/main/streams/streams.c:1.82.2.4 Sun Jan 1 12:50:18 2006
+++ php-src/main/streams/streams.c Thu Apr 20 17:43:18 2006
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.82.2.4 2006/01/01 12:50:18 sniper Exp $ */
+/* $Id: streams.c,v 1.82.2.5 2006/04/20 17:43:18 mike Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -433,7 +433,7 @@
/* allocate a buffer for reading chunks */
chunk_buf = emalloc(stream-chunk_size);
- while (!err_flag (stream-writepos - stream-readpos
(off_t)size)) {
+ while (!stream-eof !err_flag (stream-writepos -
stream-readpos (off_t)size)) {
size_t justread = 0;
int flags;
php_stream_bucket *bucket;
@@ -442,7 +442,7 @@
/* read a chunk into a bucket */
justread = stream-ops-read(stream, chunk_buf,
stream-chunk_size TSRMLS_CC);
- if (justread != (size_t)-1) {
+ if (justread justread != (size_t)-1) {
bucket = php_stream_bucket_new(stream,
chunk_buf, justread, 0, 0 TSRMLS_CC);
/* after this call, bucket is owned by the
brigade */
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.522r2=1.2027.2.523diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.522 php-src/NEWS:1.2027.2.523
--- php-src/NEWS:1.2027.2.522 Thu Apr 20 07:30:37 2006
+++ php-src/NEWSThu Apr 20 17:43:18 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Apr 2006, PHP 5.1.3
+- Fixed reading stream filters never notified about EOF. (Mike)
- Fixed bug #37138 (__autoload tries to load callback'ed self and parent).
(Dmitry)
- Fixed bug #37103 (libmbfl headers not installed). (Jani)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/filters/read.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/filters/read.phpt
+++ php-src/ext/standard/tests/filters/read.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
iliaa Thu Apr 20 21:11:29 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS configure.in /php-src/main php_version.h Log: Prepare for RC3 http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.523r2=1.2027.2.524diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.523 php-src/NEWS:1.2027.2.524 --- php-src/NEWS:1.2027.2.523 Thu Apr 20 17:43:18 2006 +++ php-src/NEWSThu Apr 20 21:11:29 2006 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Apr 2006, PHP 5.1.3 +20 Apr 2006, PHP 5.1.3RC3 - Fixed reading stream filters never notified about EOF. (Mike) - Fixed bug #37138 (__autoload tries to load callback'ed self and parent). (Dmitry) @@ -30,7 +30,7 @@ - Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever). (Ilia) -06 Apr 2006, PHP 5.1.3RC3 +06 Apr 2006, PHP 5.1.3RC2 - Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) - Changed SOAP extension to cache WSDL structure in memory and thus speed up SoapClient/SoapServer construction. (Andrei, Dmitry) http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.579.2.46r2=1.579.2.47diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.46 php-src/configure.in:1.579.2.47 --- php-src/configure.in:1.579.2.46 Tue Apr 18 23:47:10 2006 +++ php-src/configure.inThu Apr 20 21:11:29 2006 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.46 2006/04/18 23:47:10 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.47 2006/04/20 21:11:29 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=3 -EXTRA_VERSION=RC3-dev +EXTRA_VERSION=RC3 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/viewcvs.cgi/php-src/main/php_version.h?r1=1.112.2.31r2=1.112.2.32diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.31 php-src/main/php_version.h:1.112.2.32 --- php-src/main/php_version.h:1.112.2.31 Tue Apr 18 23:47:10 2006 +++ php-src/main/php_version.h Thu Apr 20 21:11:29 2006 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 3 -#define PHP_EXTRA_VERSION RC3-dev -#define PHP_VERSION 5.1.3RC3-dev +#define PHP_EXTRA_VERSION RC3 +#define PHP_VERSION 5.1.3RC3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_sdl.c php_sdl.h php_soap.h soap.c /ext/soap/tests/bugs bug37083.phpt
dmitry Wed Apr 19 10:48:54 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/soap php_sdl.c php_sdl.h php_soap.h soap.c
/php-src/ext/soap/tests/bugsbug37083.phpt
Log:
Cleaned up Andrei's patch for caching WSDL in process memory, added TTL and
LIMIT for memory cache.
Memory cache is disblead by fefault because it is experemental and isn't
tested enough. It can be enabled whit configuartion directive soap.wsdl_cache
= WSDL_CACHE_MEMORY or soap.wsdl_cache = WSDL_CACHE_BOTH or derectly in
SoapClent/SoapServer constructor: $ws = new SoapClient($wsdl,
array(cache_wsdl=WSDL_CACHE_BOTH))
Disk and memory caches use the same TTL value - soap.wsdl_cache_ttl.
Configuration directive soap.wsdl_cache_limit restricts the number of
cached wsdl files in memory. Adding new files into full memory cache will
delete oldest files from it.
Note that, each PHP process or thread uses it's own memory cache.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.520r2=1.2027.2.521diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.520 php-src/NEWS:1.2027.2.521
--- php-src/NEWS:1.2027.2.520 Tue Apr 18 14:30:16 2006
+++ php-src/NEWSWed Apr 19 10:48:54 2006
@@ -30,7 +30,7 @@
06 Apr 2006, PHP 5.1.3RC3
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
- Changed SOAP extension to cache WSDL structure in memory and thus speed up
- SoapClient/SoapServer construction. (Andrei)
+ SoapClient/SoapServer construction. (Andrei, Dmitry)
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Added overflow checks to wordwrap() function. (Ilia)
- Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.11r2=1.88.2.12diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.11
php-src/ext/soap/php_sdl.c:1.88.2.12
--- php-src/ext/soap/php_sdl.c:1.88.2.11Tue Apr 18 13:07:59 2006
+++ php-src/ext/soap/php_sdl.c Wed Apr 19 10:48:54 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.11 2006/04/18 13:07:59 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12 2006/04/19 10:48:54 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -1417,7 +1417,7 @@
return ht;
}
-static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t
TSRMLS_DC)
+static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t,
time_t *cached TSRMLS_DC)
{
sdlPtr sdl;
time_t old_t;
@@ -1461,6 +1461,7 @@
efree(buf);
return NULL;
}
+ *cached = old_t;
WSDL_CACHE_GET_INT(i, in);
if (i == 0 strncmp(in, uri, i) != 0) {
@@ -3027,29 +3028,109 @@
return psdl;
}
-sdlPtr get_sdl(zval *this_ptr, char *uri, zend_bool persistent TSRMLS_DC)
+typedef struct _sdl_cache_bucket {
+ sdlPtr sdl;
+ time_t time;
+} sdl_cache_bucket;
+
+static void delete_psdl(void *data)
+{
+ sdl_cache_bucket *p = (sdl_cache_bucket*)data;
+ sdlPtr tmp = p-sdl;
+
+ zend_hash_destroy(tmp-functions);
+ if (tmp-source) {
+ free(tmp-source);
+ }
+ if (tmp-target_ns) {
+ free(tmp-target_ns);
+ }
+ if (tmp-elements) {
+ zend_hash_destroy(tmp-elements);
+ free(tmp-elements);
+ }
+ if (tmp-encoders) {
+ zend_hash_destroy(tmp-encoders);
+ free(tmp-encoders);
+ }
+ if (tmp-types) {
+ zend_hash_destroy(tmp-types);
+ free(tmp-types);
+ }
+ if (tmp-groups) {
+ zend_hash_destroy(tmp-groups);
+ free(tmp-groups);
+ }
+ if (tmp-bindings) {
+ zend_hash_destroy(tmp-bindings);
+ free(tmp-bindings);
+ }
+ if (tmp-requests) {
+ zend_hash_destroy(tmp-requests);
+ free(tmp-requests);
+ }
+ free(tmp);
+}
+
+sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC)
{
+ char fn[MAXPATHLEN];
sdlPtr sdl = NULL;
char* old_error_code = SOAP_GLOBAL(error_code);
- int uri_len;
+ int uri_len = 0;
php_stream_context *context=NULL;
zval **tmp, **proxy_host, **proxy_port, *orig_context = NULL,
*new_context = NULL;
smart_str headers = {0};
- char *pkey = NULL;
- int plen;
+ char* key = NULL;
+ time_t t = time(0);
+
+ if (strchr(uri,':') != NULL || IS_ABSOLUTE_PATH(uri, uri_len)) {
+ uri_len = strlen(uri);
+ } else if (VCWD_REALPATH(uri, fn) == NULL) {
+ cache_wsdl = WSDL_CACHE_NONE;
+ } else {
+ uri = fn;
+
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_sdl.c /ext/soap/tests/bugs bug37083.phpt bug37083.wsdl
dmitry Tue Apr 18 13:07:59 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/soap/tests/bugsbug37083.phpt bug37083.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching
code in multithread WS). (Andrei, Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.518r2=1.2027.2.519diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.518 php-src/NEWS:1.2027.2.519
--- php-src/NEWS:1.2027.2.518 Mon Apr 17 23:28:02 2006
+++ php-src/NEWSTue Apr 18 13:07:59 2006
@@ -2,6 +2,8 @@
|||
?? Apr 2006, PHP 5.1.3
- Fixed bug #37103 (libmbfl headers not installed). (Jani)
+- Fixed bug #37083 (Frequent crashs in SOAP extension with new WSDL caching
+ code in multithread WS). (Andrei, Dmitry)
- Fixed bug #37062 (compile failure on ARM architecture). (Tony)
- Fixed bug #37061 (curl_exec() doesn't zero-terminate binary strings). (Tony)
- Fixed bug #37060 (Type of retval of Countable::count() is not checked).
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.10r2=1.88.2.11diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.10
php-src/ext/soap/php_sdl.c:1.88.2.11
--- php-src/ext/soap/php_sdl.c:1.88.2.10Mon Apr 17 16:08:08 2006
+++ php-src/ext/soap/php_sdl.c Tue Apr 18 13:07:59 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.10 2006/04/17 16:08:08 andrei Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.11 2006/04/18 13:07:59 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -143,13 +143,18 @@
enc = get_encoder_ex(NULL, enc_nscat, enc_len);
efree(enc_nscat);
if (enc sdl) {
- encodePtr new_enc = emalloc(sizeof(encode));
+ encodePtr new_enc = pemalloc(sizeof(encode),
sdl-is_persistent);
memcpy(new_enc, enc, sizeof(encode));
- new_enc-details.ns = estrndup(ns, ns_len);
- new_enc-details.type_str =
estrdup(new_enc-details.type_str);
+ if (sdl-is_persistent) {
+ new_enc-details.ns = zend_strndup(ns, ns_len);
+ new_enc-details.type_str =
strdup(new_enc-details.type_str);
+ } else {
+ new_enc-details.ns = estrndup(ns, ns_len);
+ new_enc-details.type_str =
estrdup(new_enc-details.type_str);
+ }
if (sdl-encoders == NULL) {
- sdl-encoders = emalloc(sizeof(HashTable));
- zend_hash_init(sdl-encoders, 0, NULL,
delete_encoder, 0);
+ sdl-encoders = pemalloc(sizeof(HashTable),
sdl-is_persistent);
+ zend_hash_init(sdl-encoders, 0, NULL,
delete_encoder, sdl-is_persistent);
}
zend_hash_update(sdl-encoders, nscat, len + 1,
new_enc, sizeof(encodePtr), NULL);
enc = new_enc;
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37083.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug37083.phpt
+++ php-src/ext/soap/tests/bugs/bug37083.phpt
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug37083.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug37083.wsdl
+++ php-src/ext/soap/tests/bugs/bug37083.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/sqlite sqlite.c
iliaa Tue Apr 18 14:30:16 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/sqlite sqlite.c
/php-srcNEWS
Log:
Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever).
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.12r2=1.166.2.13diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.12
php-src/ext/sqlite/sqlite.c:1.166.2.13
--- php-src/ext/sqlite/sqlite.c:1.166.2.12 Wed Mar 29 14:28:42 2006
+++ php-src/ext/sqlite/sqlite.c Tue Apr 18 14:30:15 2006
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.166.2.12 2006/03/29 14:28:42 tony2001 Exp $
+ $Id: sqlite.c,v 1.166.2.13 2006/04/18 14:30:15 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1124,7 +1124,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.12 2006/03/29 14:28:42
tony2001 Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.13 2006/04/18 14:30:15
iliaa 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();
@@ -1705,7 +1705,9 @@
add_index_string(return_value, i, colnames[ncols + i] ?
(char *)colnames[ncols + i] : , 1);
}
}
-
+ if (res.vm) {
+ sqlite_finalize(res.vm, NULL);
+ }
done:
sqlite_exec(db-db, PRAGMA show_datatypes = OFF, NULL, NULL, NULL);
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.519r2=1.2027.2.520diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.519 php-src/NEWS:1.2027.2.520
--- php-src/NEWS:1.2027.2.519 Tue Apr 18 13:07:59 2006
+++ php-src/NEWSTue Apr 18 14:30:16 2006
@@ -24,6 +24,8 @@
- Fixed Bug #36872 (session_destroy() fails after call to
session_regenerate_id(true)). (Ilia)
- Fixed bug #36513 (comment will be outputed in last line). (Dmitry)
+- Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever).
+ (Ilia)
06 Apr 2006, PHP 5.1.3RC3
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
sniper Mon Apr 17 22:14:32 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.516r2=1.2027.2.517diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.516 php-src/NEWS:1.2027.2.517 --- php-src/NEWS:1.2027.2.516 Sun Apr 16 16:54:49 2006 +++ php-src/NEWSMon Apr 17 22:14:32 2006 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Apr 2006, PHP 5.1.3 +- Fixed bug #37103 (libmbfl headers not installed). (Jani) - Fixed bug #37062 (compile failure on ARM architecture). (Tony) - Fixed bug #37061 (curl_exec() doesn't zero-terminate binary strings). (Tony) - Fixed bug #37060 (Type of retval of Countable::count() is not checked). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
iliaa Mon Apr 17 23:28:02 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Fixed Bug #36872 (session_destroy() fails after call to + session_regenerate_id(true)). http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.517r2=1.2027.2.518diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.517 php-src/NEWS:1.2027.2.518 --- php-src/NEWS:1.2027.2.517 Mon Apr 17 22:14:32 2006 +++ php-src/NEWSMon Apr 17 23:28:02 2006 @@ -19,6 +19,8 @@ - Fixed bug #37045 (Fixed check for special chars for http redirects). (Ilia) - Fixed bug #37002 (Have to quote literals in INI when concatenating with vars). (Dmitry) +- Fixed Bug #36872 (session_destroy() fails after call to + session_regenerate_id(true)). (Ilia) - Fixed bug #36513 (comment will be outputed in last line). (Dmitry) 06 Apr 2006, PHP 5.1.3RC3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard http_fopen_wrapper.c
iliaa Sun Apr 16 16:54:49 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard http_fopen_wrapper.c
/php-srcNEWS
Log:
Fixed bug #37045 (Fixed check for special chars for http redirects).
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.10r2=1.99.2.11diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.10
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.11
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.10 Sun Mar 26 17:12:05 2006
+++ php-src/ext/standard/http_fopen_wrapper.c Sun Apr 16 16:54:49 2006
@@ -19,7 +19,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.99.2.10 2006/03/26 17:12:05 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.99.2.11 2006/04/16 16:54:49 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -639,10 +639,11 @@
} \
} \
/* check for control characters in login, password
path */
- CHECK_FOR_CNTRL_CHARS(resource-user)
- CHECK_FOR_CNTRL_CHARS(resource-pass)
- CHECK_FOR_CNTRL_CHARS(resource-path)
-
+ if (strncasecmp(newpath, http://;, sizeof(http://;) -
1) || strncasecmp(newpath, https://;, sizeof(https://;) - 1) {
+ CHECK_FOR_CNTRL_CHARS(resource-user)
+ CHECK_FOR_CNTRL_CHARS(resource-pass)
+ CHECK_FOR_CNTRL_CHARS(resource-path)
+ }
stream = php_stream_url_wrap_http_ex(wrapper, new_path,
mode, options, opened_path, context, --redirect_max, 0 STREAMS_CC TSRMLS_CC);
} else {
php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, HTTP request failed! %s, tmp_line);
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.515r2=1.2027.2.516diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.515 php-src/NEWS:1.2027.2.516
--- php-src/NEWS:1.2027.2.515 Sat Apr 15 12:54:14 2006
+++ php-src/NEWSSun Apr 16 16:54:49 2006
@@ -15,6 +15,7 @@
- Fixed bug #37053 (html_errors with internal classes produces wrong links).
(Tony)
- Fixed bug #37046 (foreach breaks static scope). (Dmitry)
+- Fixed bug #37045 (Fixed check for special chars for http redirects). (Ilia)
- Fixed bug #37002 (Have to quote literals in INI when concatenating with
vars). (Dmitry)
- Fixed bug #36513 (comment will be outputed in last line). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_http.c soap.c
dmitry Thu Apr 13 08:18:36 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/soap php_http.c soap.c
Log:
Fixed bug #37054 (SoapClient Error Fetching http headers)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.511r2=1.2027.2.512diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.511 php-src/NEWS:1.2027.2.512
--- php-src/NEWS:1.2027.2.511 Wed Apr 12 19:30:52 2006
+++ php-src/NEWSThu Apr 13 08:18:36 2006
@@ -9,6 +9,7 @@
which are unaccessible). (Tony)
- Fixed bug #37055 (incorrect reference counting for persistent OCI8
connections). (Tony)
+- Fixed bug #37054 (SoapClient Error Fetching http headers). (Dmitry)
- Fixed bug #37053 (html_errors with internal classes produces wrong links).
(Tony)
- Fixed bug #37046 (foreach breaks static scope). (Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.10r2=1.77.2.11diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.10
php-src/ext/soap/php_http.c:1.77.2.11
--- php-src/ext/soap/php_http.c:1.77.2.10 Mon Mar 20 10:36:55 2006
+++ php-src/ext/soap/php_http.c Thu Apr 13 08:18:36 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.77.2.10 2006/03/20 10:36:55 dmitry Exp $ */
+/* $Id: php_http.c,v 1.77.2.11 2006/04/13 08:18:36 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -416,13 +416,22 @@
smart_str_appendc(soap_headers, ':');
smart_str_append_unsigned(soap_headers, phpurl-port);
}
- smart_str_append_const(soap_headers, \r\n
- Connection: Keep-Alive\r\n
+ smart_str_append_const(soap_headers, \r\n
+ Connection: Keep-Alive\r\n);
/*
Connection: close\r\n
Accept: text/html; text/xml; text/plain\r\n
*/
- User-Agent: PHP SOAP 0.1\r\n);
+ if (zend_hash_find(Z_OBJPROP_P(this_ptr), _user_agent,
sizeof(_user_agent), (void **)tmp) == SUCCESS
+ Z_TYPE_PP(tmp) == IS_STRING) {
+ if (Z_STRLEN_PP(tmp) 0) {
+ smart_str_append_const(soap_headers,
User-Agent: );
+ smart_str_appendl(soap_headers,
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+ smart_str_append_const(soap_headers, \r\n);
+ }
+ } else{
+ smart_str_append_const(soap_headers, User-Agent:
PHP-SOAP/PHP_VERSION\r\n);
+ }
smart_str_append(soap_headers, soap_headers_z);
smart_str_free(soap_headers_z);
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.24r2=1.156.2.25diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.24 php-src/ext/soap/soap.c:1.156.2.25
--- php-src/ext/soap/soap.c:1.156.2.24 Sun Apr 9 23:35:51 2006
+++ php-src/ext/soap/soap.c Thu Apr 13 08:18:36 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.24 2006/04/09 23:35:51 andrei Exp $ */
+/* $Id: soap.c,v 1.156.2.25 2006/04/13 08:18:36 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2284,6 +2284,11 @@
persistent = zend_is_true(*tmp);
}
+ if (zend_hash_find(ht, user_agent, sizeof(user_agent),
(void**)tmp) == SUCCESS
+ Z_TYPE_PP(tmp) == IS_STRING) {
+ add_property_stringl(this_ptr, _user_agent,
Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), 1);
+ }
+
} else if (wsdl == NULL) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, 'location' and 'uri'
options are requred in nonWSDL mode);
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/curl interface.c multi.c
tony2001Thu Apr 13 11:26:10 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/curl interface.c multi.c
Log:
fix bug #37061 (curl_exec() doesn't zero-terminate binary strings) - we get
the data length from cURL, so it's binary safe.
fix leak appearing when re-using curl handle
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.512r2=1.2027.2.513diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.512 php-src/NEWS:1.2027.2.513
--- php-src/NEWS:1.2027.2.512 Thu Apr 13 08:18:36 2006
+++ php-src/NEWSThu Apr 13 11:26:10 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Apr 2006, PHP 5.1.3
+- Fixed bug #37061 (curl_exec() doesn't zero-terminate binary strings). (Tony)
- Fixed bug #37060 (Type of retval of Countable::count() is not checked).
(Johannes)
- FIxed bug #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/interface.c?r1=1.62.2.13r2=1.62.2.14diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.13
php-src/ext/curl/interface.c:1.62.2.14
--- php-src/ext/curl/interface.c:1.62.2.13 Thu Jan 26 13:23:33 2006
+++ php-src/ext/curl/interface.cThu Apr 13 11:26:10 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.62.2.13 2006/01/26 13:23:33 mike Exp $ */
+/* $Id: interface.c,v 1.62.2.14 2006/04/13 11:26:10 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1208,6 +1208,8 @@
if (Z_LVAL_PP(zvalue)) {
ch-handlers-write-type = PHP_CURL_BINARY;
+ } else {
+ ch-handlers-write-type = PHP_CURL_ASCII;
}
break;
case CURLOPT_WRITEFUNCTION:
@@ -1462,7 +1464,7 @@
void _php_curl_cleanup_handle(php_curl *ch)
{
if (ch-handlers-write-buf.len 0) {
- memset(ch-handlers-write-buf, 0, sizeof(smart_str));
+ smart_str_free(ch-handlers-write-buf);
}
if (ch-header.str_len) {
efree(ch-header.str);
@@ -1497,7 +1499,6 @@
if (ch-handlers-write-buf.len 0) {
smart_str_free(ch-handlers-write-buf);
}
-
RETURN_FALSE;
}
@@ -1505,10 +1506,8 @@
if (ch-handlers-write-method == PHP_CURL_RETURN
ch-handlers-write-buf.len 0) {
--ch-uses;
- if (ch-handlers-write-type != PHP_CURL_BINARY) {
- smart_str_0(ch-handlers-write-buf);
- }
- RETURN_STRINGL(ch-handlers-write-buf.c,
ch-handlers-write-buf.len, 0);
+ smart_str_0(ch-handlers-write-buf);
+ RETURN_STRINGL(ch-handlers-write-buf.c,
ch-handlers-write-buf.len, 1);
}
--ch-uses;
RETURN_TRUE;
@@ -1739,6 +1738,9 @@
zend_llist_clean(ch-to_free.slist);
zend_llist_clean(ch-to_free.post);
+ if (ch-handlers-write-buf.len 0) {
+ smart_str_free(ch-handlers-write-buf);
+ }
if (ch-handlers-write-func_name) {
zval_ptr_dtor(ch-handlers-write-func_name);
}
@@ -1754,7 +1756,7 @@
if (ch-header.str_len 0) {
efree(ch-header.str);
}
-
+
efree(ch-handlers-write);
efree(ch-handlers-write_header);
efree(ch-handlers-read);
http://cvs.php.net/viewcvs.cgi/php-src/ext/curl/multi.c?r1=1.19.2.2r2=1.19.2.3diff_format=u
Index: php-src/ext/curl/multi.c
diff -u php-src/ext/curl/multi.c:1.19.2.2 php-src/ext/curl/multi.c:1.19.2.3
--- php-src/ext/curl/multi.c:1.19.2.2 Sun Jan 1 12:50:01 2006
+++ php-src/ext/curl/multi.cThu Apr 13 11:26:10 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: multi.c,v 1.19.2.2 2006/01/01 12:50:01 sniper Exp $ */
+/* $Id: multi.c,v 1.19.2.3 2006/04/13 11:26:10 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -195,11 +195,8 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, z_ch, -1, le_curl_name, le_curl);
if (ch-handlers-write-method == PHP_CURL_RETURN
ch-handlers-write-buf.len 0) {
- if (ch-handlers-write-type != PHP_CURL_BINARY) {
- smart_str_0(ch-handlers-write-buf);
- }
-
- RETURN_STRINGL(ch-handlers-write-buf.c,
ch-handlers-write-buf.len, 0);
+ smart_str_0(ch-handlers-write-buf);
+ RETURN_STRINGL(ch-handlers-write-buf.c,
ch-handlers-write-buf.len, 1);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit:
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/xmlrpc xmlrpc-epi-php.c
tony2001Wed Apr 12 15:13:57 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-srcNEWS
Log:
fix #37057 (xmlrpc_decode() may produce arrays with numeric strings which are
unaccessible)
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.4r2=1.39.2.5diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.4
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.4Sun Jan 1 12:50:16 2006
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Wed Apr 12 15:13:56 2006
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.4 2006/01/01 12:50:16 sniper Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5 2006/04/12 15:13:56 tony2001 Exp $ */
/**
* BUGS: *
@@ -300,7 +300,13 @@
{
if (list val) {
if (id) {
- return zend_hash_update(Z_ARRVAL_P(list), (char*) id,
strlen(id) + 1, (void *) val, sizeof(zval **), NULL);
+ int id_len = strlen(id);
+ if (!(id_len 1 id[0] == '0')
is_numeric_string((char *)id, id_len, NULL, NULL, 0) == IS_LONG) {
+ long index = strtol(id, NULL, 0);
+ return zend_hash_index_update(Z_ARRVAL_P(list),
index, (void *) val, sizeof(zval **), NULL);
+ } else {
+ return zend_hash_update(Z_ARRVAL_P(list),
(char*) id, strlen(id) + 1, (void *) val, sizeof(zval **), NULL);
+ }
} else {
return zend_hash_next_index_insert(Z_ARRVAL_P(list),
(void *) val, sizeof(zval **), NULL);
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.508r2=1.2027.2.509diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.508 php-src/NEWS:1.2027.2.509
--- php-src/NEWS:1.2027.2.508 Wed Apr 12 13:37:51 2006
+++ php-src/NEWSWed Apr 12 15:13:57 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Apr 2006, PHP 5.1.3
+- Fixed bug #37057 (xmlrpc_decode() may produce arrays with numeric strings,
+ which are unaccessible). (Tony)
- Fixed bug #37055 (incorrect reference counting for persistent OCI8
connections). (Tony)
- Fixed bug #37053 (html_errors with internal classes produces wrong links).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/oci8 oci8.c oci8_statement.c /ext/oci8/tests bind_long.phpt bind_long_raw.phpt bind_raw.phpt test.gif
tony2001Wed Apr 12 19:21:35 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/oci8/tests bind_long.phpt bind_long_raw.phpt
bind_raw.phpt test.gif
Modified files:
/php-srcNEWS
/php-src/ext/oci8 oci8.c oci8_statement.c
Log:
fix #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW fields)
add tests
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.509r2=1.2027.2.510diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.509 php-src/NEWS:1.2027.2.510
--- php-src/NEWS:1.2027.2.509 Wed Apr 12 15:13:57 2006
+++ php-src/NEWSWed Apr 12 19:21:34 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Apr 2006, PHP 5.1.3
+- FIxed bug #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW
+ fields). (Tony)
- Fixed bug #37057 (xmlrpc_decode() may produce arrays with numeric strings,
which are unaccessible). (Tony)
- Fixed bug #37055 (incorrect reference counting for persistent OCI8
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.15r2=1.269.2.16diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.15 php-src/ext/oci8/oci8.c:1.269.2.16
--- php-src/ext/oci8/oci8.c:1.269.2.15 Wed Apr 12 18:01:35 2006
+++ php-src/ext/oci8/oci8.c Wed Apr 12 19:21:35 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.15 2006/04/12 18:01:35 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.16 2006/04/12 19:21:35 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -541,6 +541,8 @@
REGISTER_LONG_CONSTANT(SQLT_FLT,SQLT_FLT, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLT_UIN,SQLT_UIN, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLT_LNG,SQLT_LNG, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SQLT_LBI,SQLT_LBI, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(SQLT_BIN,SQLT_BIN, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SQLT_ODT,SQLT_ODT, CONST_CS |
CONST_PERSISTENT);
#if defined(HAVE_OCI_INSTANT_CLIENT) || (defined(OCI_MAJOR_VERSION)
OCI_MAJOR_VERSION 10)
REGISTER_LONG_CONSTANT(SQLT_BDOUBLE,SQLT_BDOUBLE, CONST_CS |
CONST_PERSISTENT);
@@ -645,7 +647,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.15 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.16 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.13r2=1.7.2.14diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.13
php-src/ext/oci8/oci8_statement.c:1.7.2.14
--- php-src/ext/oci8/oci8_statement.c:1.7.2.13 Sat Mar 18 22:06:31 2006
+++ php-src/ext/oci8/oci8_statement.c Wed Apr 12 19:21:35 2006
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_statement.c,v 1.7.2.13 2006/03/18 22:06:31 tony2001 Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.14 2006/04/12 19:21:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
@@ -493,6 +493,9 @@
case SQLT_BIN:
default:
define_type = SQLT_CHR;
+ if (outcol-data_type == SQLT_BIN) {
+ define_type = SQLT_BIN;
+ }
if ((outcol-data_type == SQLT_DAT) ||
(outcol-data_type == SQLT_NUM)
#ifdef SQLT_TIMESTAMP
|| (outcol-data_type ==
SQLT_TIMESTAMP)
@@ -813,6 +816,9 @@
mode = OCI_DEFAULT;
break;
+ case SQLT_LBI:
+ case SQLT_BIN:
+ case SQLT_LNG:
case SQLT_CHR:
/* this is the default case when type was not specified
*/
convert_to_string(var);
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/bind_long.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/bind_long.phpt
+++ php-src/ext/oci8/tests/bind_long.phpt
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/tests/bind_long_raw.phpt?view=markuprev=1.1
Index: php-src/ext/oci8/tests/bind_long_raw.phpt
+++ php-src/ext/oci8/tests/bind_long_raw.phpt
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard array.c
johannesWed Apr 12 19:30:52 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard array.c
Log:
- MFH: Fix bug #37060 (Type of retval of Countable::count() is not checked)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.510r2=1.2027.2.511diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.510 php-src/NEWS:1.2027.2.511
--- php-src/NEWS:1.2027.2.510 Wed Apr 12 19:21:34 2006
+++ php-src/NEWSWed Apr 12 19:30:52 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? Apr 2006, PHP 5.1.3
+- Fixed bug #37060 (Type of retval of Countable::count() is not checked).
+ (Johannes)
- FIxed bug #37059 (oci_bind_by_name() doesn't support RAW and LONG RAW
fields). (Tony)
- Fixed bug #37057 (xmlrpc_decode() may produce arrays with numeric strings,
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/array.c?r1=1.308.2.20r2=1.308.2.21diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.20
php-src/ext/standard/array.c:1.308.2.21
--- php-src/ext/standard/array.c:1.308.2.20 Wed Mar 22 22:05:51 2006
+++ php-src/ext/standard/array.cWed Apr 12 19:30:52 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.20 2006/03/22 22:05:51 tony2001 Exp $ */
+/* $Id: array.c,v 1.308.2.21 2006/04/12 19:30:52 johannes Exp $ */
#include php.h
#include php_ini.h
@@ -313,6 +313,7 @@
if (Z_OBJ_HT_P(array)-get_class_entry
instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
zend_call_method_with_0_params(array, NULL,
NULL, count, retval);
if (retval) {
+ convert_to_long(retval);
RETVAL_LONG(Z_LVAL_P(retval));
zval_ptr_dtor(retval);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
sniper Mon Apr 10 09:41:45 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Fix NEWS http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.501r2=1.2027.2.502diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.501 php-src/NEWS:1.2027.2.502 --- php-src/NEWS:1.2027.2.501 Sun Apr 9 23:35:51 2006 +++ php-src/NEWSMon Apr 10 09:41:45 2006 @@ -1,22 +1,22 @@ PHPNEWS ||| 06 Apr 2006, PHP 5.1.3RC3 -- Sped up SoapClient/SoapServer construction by making SOAP extension cache - WSDL structure in memory. (Andrei) +- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) +- Changed SOAP extension to cache WSDL structure in memory and thus speed up + SoapClient/SoapServer construction. (Andrei) +- Removed the E_STRICT deprecation notice from var. (Ilia) +- Added overflow checks to wordwrap() function. (Ilia) +- Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8 + (also fixes bug #36764). (Tony) +- Fixed tempnam() 2nd parameter to be checked against path components. (Ilia) - Fixed a bug that would not fill in the fifth argument to preg_replace() properly, if the variable was not declared previously. (Andrei) - Fixed safe_mode check for source argument of the copy() function. (Ilia) - Fixed mysqli bigint conversion under Windows (Georg) - Fixed XSS inside phpinfo() with long inputs. (Ilia) -- Check 2nd parameter of tempnam() against path components. (Ilia) - Fixed Apache2 SAPIs header handler modifying header strings. (Mike) -- Allowed 'auto_globals_jit' work together with 'register_argc_argv'. (Dmitry) -- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) +- Fixed 'auto_globals_jit' to work together with 'register_argc_argv'. (Dmitry) - Fixed offset/length parameter validation in substr_compare() function. (Ilia) -- Added overflow checks to wordwrap() function. (Ilia) -- Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8 - (also fixes bug #36764). (Tony) -- Removed the E_STRICT deprecation notice from var. (Ilia) - Fixed debug_zval_dump() to support private and protected members. (Dmitry) - Fixed SoapFault::getMessage(). (Dmitry) - Fixed bug #36981 (SplFileObject-fgets() ignores max_length). (Tony) @@ -70,7 +70,7 @@ (Dmitry) 09 Mar 2006, PHP 5.1.3RC1 -- Updated PCRE to version 6.6. (Andrei) +- Updated bundled PCRE libary to version 6.6. (Andrei) - Moved extensions to PECL: . ext/msession (Derick) - Reimplemented FastCGI interface. (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug36908.phpt bug36908.wsdl
dmitry Mon Apr 10 13:29:49 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/soap/tests/bugsbug36908.phpt bug36908.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #36908 (wsdl default value overrides value in soap request).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.502r2=1.2027.2.503diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.502 php-src/NEWS:1.2027.2.503
--- php-src/NEWS:1.2027.2.502 Mon Apr 10 09:41:45 2006
+++ php-src/NEWSMon Apr 10 13:29:48 2006
@@ -26,6 +26,8 @@
- Fixed bug #36941 (ArrayIterator does not clone itself). (Marcus)
- Fixed bug #36934 (OCILob-read() doesn't move internal pointer when
reading 0's). (Tony)
+- Fixed bug #36908 (wsdl default value overrides value in soap request).
+ (Dmitry)
- Fixed bug #36898 (__set() leaks in classes extending internal ones).
(Tony, Dmitry)
- Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.19r2=1.103.2.20diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.19
php-src/ext/soap/php_encoding.c:1.103.2.20
--- php-src/ext/soap/php_encoding.c:1.103.2.19 Sun Apr 9 23:35:51 2006
+++ php-src/ext/soap/php_encoding.c Mon Apr 10 13:29:48 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.19 2006/04/09 23:35:51 andrei Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.20 2006/04/10 13:29:48 dmitry Exp $ */
#include time.h
@@ -1128,11 +1128,13 @@
{
switch (model-kind) {
case XSD_CONTENT_ELEMENT:
- if (model-u.element-name) {
- xmlNodePtr node = get_node(data-children,
model-u.element-name);
- if (node) {
- zval *val;
+ if (model-u.element-name) {
+ xmlNodePtr node = get_node(data-children,
model-u.element-name);
+ if (node) {
+ zval *val;
+
+ node = check_and_resolve_href(node);
if (node node-children
node-children-content) {
if (model-u.element-fixed
strcmp(model-u.element-fixed,node-children-content) != 0) {
soap_error3(E_ERROR,
Encoding: Element '%s' has fixed value '%s' (value '%s' is not allowed),
model-u.element-name, model-u.element-fixed, node-children-content);
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36908.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug36908.phpt
+++ php-src/ext/soap/tests/bugs/bug36908.phpt
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/tests/bugs/bug36908.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug36908.wsdl
+++ php-src/ext/soap/tests/bugs/bug36908.wsdl
--
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_1) / NEWS /ext/standard filestat.c
ext/standard/tests/file/bug24313.phpt fails after this patch.
See also http://bugs.php.net/bug.php?id=24313
On 09.04.2006 21:57, Ilia Alshanetsky wrote:
iliaa Sun Apr 9 17:57:27 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/standard filestat.c
Log:
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.499r2=1.2027.2.500diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.499 php-src/NEWS:1.2027.2.500
--- php-src/NEWS:1.2027.2.499 Fri Apr 7 14:20:56 2006
+++ php-src/NEWSSun Apr 9 17:57:27 2006
@@ -29,6 +29,7 @@
- Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia)
- Fixed bug #36878 (error messages are printed even though an exception has
been thrown). (Tony)
+- Fixed bug #36875 (is_*() functions do not account for open_basedir). (Ilia)
- Fixed bug #36869 (memory leak in output buffering when using chunked output).
(Tony)
- Fixed bug #36859 (DOMElement crashes when calling __construct when
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.5r2=1.136.2.6diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.5
php-src/ext/standard/filestat.c:1.136.2.6
--- php-src/ext/standard/filestat.c:1.136.2.5 Mon Mar 6 20:21:52 2006
+++ php-src/ext/standard/filestat.c Sun Apr 9 17:57:27 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.136.2.5 2006/03/06 20:21:52 rrichards Exp $ */
+/* $Id: filestat.c,v 1.136.2.6 2006/04/09 17:57:27 iliaa Exp $ */
#include php.h
#include safe_mode.h
@@ -607,15 +607,22 @@
int flags = 0, rmask=S_IROTH, wmask=S_IWOTH, xmask=S_IXOTH; /* access
rights defaults to other */
char *stat_sb_names[13]={dev, ino, mode, nlink, uid, gid,
rdev,
size, atime, mtime, ctime, blksize,
blocks};
+ char *local;
+ php_stream_wrapper *wrapper;
if (!filename_length) {
RETURN_FALSE;
}
+ if ((wrapper = php_stream_locate_url_wrapper(filename, local, 0 TSRMLS_CC)) == php_plain_files_wrapper) {
+ if (php_check_open_basedir(local TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
+ }
+
if (IS_ACCESS_CHECK(type)) {
- char *local;
+ if (wrapper == php_plain_files_wrapper) {
- if (php_stream_locate_url_wrapper(filename, local, 0 TSRMLS_CC) == php_plain_files_wrapper) {
switch (type) {
#ifdef F_OK
case FS_EXISTS:
@@ -695,9 +702,6 @@
if (IS_ABLE_CHECK(type) getuid() == 0) {
/* root has special perms on plain_wrapper
But we don't know about root under Netware */
- php_stream_wrapper *wrapper;
-
- wrapper = php_stream_locate_url_wrapper(filename, NULL, 0
TSRMLS_CC);
if (wrapper == php_plain_files_wrapper) {
if (type == FS_IS_X) {
xmask = S_IXROOT;
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard filestat.c
iliaa Sun Apr 9 17:57:27 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard filestat.c
Log:
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.499r2=1.2027.2.500diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.499 php-src/NEWS:1.2027.2.500
--- php-src/NEWS:1.2027.2.499 Fri Apr 7 14:20:56 2006
+++ php-src/NEWSSun Apr 9 17:57:27 2006
@@ -29,6 +29,7 @@
- Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia)
- Fixed bug #36878 (error messages are printed even though an exception has
been thrown). (Tony)
+- Fixed bug #36875 (is_*() functions do not account for open_basedir). (Ilia)
- Fixed bug #36869 (memory leak in output buffering when using chunked output).
(Tony)
- Fixed bug #36859 (DOMElement crashes when calling __construct when
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.5r2=1.136.2.6diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.5
php-src/ext/standard/filestat.c:1.136.2.6
--- php-src/ext/standard/filestat.c:1.136.2.5 Mon Mar 6 20:21:52 2006
+++ php-src/ext/standard/filestat.c Sun Apr 9 17:57:27 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filestat.c,v 1.136.2.5 2006/03/06 20:21:52 rrichards Exp $ */
+/* $Id: filestat.c,v 1.136.2.6 2006/04/09 17:57:27 iliaa Exp $ */
#include php.h
#include safe_mode.h
@@ -607,15 +607,22 @@
int flags = 0, rmask=S_IROTH, wmask=S_IWOTH, xmask=S_IXOTH; /* access
rights defaults to other */
char *stat_sb_names[13]={dev, ino, mode, nlink, uid, gid,
rdev,
size, atime, mtime, ctime, blksize,
blocks};
+ char *local;
+ php_stream_wrapper *wrapper;
if (!filename_length) {
RETURN_FALSE;
}
+ if ((wrapper = php_stream_locate_url_wrapper(filename, local, 0
TSRMLS_CC)) == php_plain_files_wrapper) {
+ if (php_check_open_basedir(local TSRMLS_CC)) {
+ RETURN_FALSE;
+ }
+ }
+
if (IS_ACCESS_CHECK(type)) {
- char *local;
+ if (wrapper == php_plain_files_wrapper) {
- if (php_stream_locate_url_wrapper(filename, local, 0
TSRMLS_CC) == php_plain_files_wrapper) {
switch (type) {
#ifdef F_OK
case FS_EXISTS:
@@ -695,9 +702,6 @@
if (IS_ABLE_CHECK(type) getuid() == 0) {
/* root has special perms on plain_wrapper
But we don't know about root under Netware */
- php_stream_wrapper *wrapper;
-
- wrapper = php_stream_locate_url_wrapper(filename, NULL, 0
TSRMLS_CC);
if (wrapper == php_plain_files_wrapper) {
if (type == FS_IS_X) {
xmask = S_IXROOT;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_encoding.c php_encoding.h php_schema.c php_schema.h php_sdl.c php_sdl.h php_soap.h soap.c
andrei Sun Apr 9 23:35:51 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/soap php_encoding.c php_encoding.h php_schema.c
php_schema.h php_sdl.c php_sdl.h php_soap.h
soap.c
Log:
Speed up SoapClient/SoapServer constructors by caching WSDL structures
in memory. All WSDL files will be cached, unless turned off via an
option to the constructor.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.500r2=1.2027.2.501diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.500 php-src/NEWS:1.2027.2.501
--- php-src/NEWS:1.2027.2.500 Sun Apr 9 17:57:27 2006
+++ php-src/NEWSSun Apr 9 23:35:51 2006
@@ -1,6 +1,8 @@
PHPNEWS
|||
06 Apr 2006, PHP 5.1.3RC3
+- Sped up SoapClient/SoapServer construction by making SOAP extension cache
+ WSDL structure in memory. (Andrei)
- Fixed a bug that would not fill in the fifth argument to preg_replace()
properly, if the variable was not declared previously. (Andrei)
- Fixed safe_mode check for source argument of the copy() function. (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.18r2=1.103.2.19diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.18
php-src/ext/soap/php_encoding.c:1.103.2.19
--- php-src/ext/soap/php_encoding.c:1.103.2.18 Mon Apr 3 09:14:33 2006
+++ php-src/ext/soap/php_encoding.c Sun Apr 9 23:35:51 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.18 2006/04/03 09:14:33 tony2001 Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.19 2006/04/09 23:35:51 andrei Exp $ */
#include time.h
@@ -3300,3 +3300,17 @@
}
efree(t);
}
+
+void delete_encoder_persistent(void *encode)
+{
+ encodePtr t = *((encodePtr*)encode);
+ if (t-details.ns) {
+ free(t-details.ns);
+ }
+ if (t-details.type_str) {
+ free(t-details.type_str);
+ }
+ /* we should never have mapping in persistent encoder */
+ assert(t-details.map == NULL);
+ free(t);
+}
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.h?r1=1.38.2.1r2=1.38.2.2diff_format=u
Index: php-src/ext/soap/php_encoding.h
diff -u php-src/ext/soap/php_encoding.h:1.38.2.1
php-src/ext/soap/php_encoding.h:1.38.2.2
--- php-src/ext/soap/php_encoding.h:1.38.2.1Sun Jan 1 12:50:13 2006
+++ php-src/ext/soap/php_encoding.h Sun Apr 9 23:35:51 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.h,v 1.38.2.1 2006/01/01 12:50:13 sniper Exp $ */
+/* $Id: php_encoding.h,v 1.38.2.2 2006/04/09 23:35:51 andrei Exp $ */
#ifndef PHP_ENCODING_H
#define PHP_ENCODING_H
@@ -219,6 +219,7 @@
encodePtr get_conversion(int encode);
void delete_encoder(void *handle);
+void delete_encoder_persistent(void *handle);
extern encode defaultEncoding[];
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_schema.c?r1=1.58.2.5r2=1.58.2.6diff_format=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.58.2.5
php-src/ext/soap/php_schema.c:1.58.2.6
--- php-src/ext/soap/php_schema.c:1.58.2.5 Wed Mar 15 16:13:18 2006
+++ php-src/ext/soap/php_schema.c Sun Apr 9 23:35:51 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_schema.c,v 1.58.2.5 2006/03/15 16:13:18 dmitry Exp $ */
+/* $Id: php_schema.c,v 1.58.2.6 2006/04/09 23:35:51 andrei Exp $ */
#include php_soap.h
#include libxml/uri.h
@@ -2358,6 +2358,28 @@
efree(tmp);
}
+void delete_model_persistent(void *handle)
+{
+ sdlContentModelPtr tmp = *((sdlContentModelPtr*)handle);
+ switch (tmp-kind) {
+ case XSD_CONTENT_ELEMENT:
+ case XSD_CONTENT_GROUP:
+ break;
+ case XSD_CONTENT_SEQUENCE:
+ case XSD_CONTENT_ALL:
+ case XSD_CONTENT_CHOICE:
+ zend_hash_destroy(tmp-u.content);
+ free(tmp-u.content);
+ break;
+ case XSD_CONTENT_GROUP_REF:
+ free(tmp-u.group_ref);
+ break;
+ default:
+ break;
+ }
+ free(tmp);
+}
+
void delete_type(void *data)
{
sdlTypePtr type = *((sdlTypePtr*)data);
@@ -2405,6 +2427,53 @@
efree(type);
}
+void delete_type_persistent(void
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
iliaa Fri Apr 7 14:20:56 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: RC3 http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.498r2=1.2027.2.499diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.498 php-src/NEWS:1.2027.2.499 --- php-src/NEWS:1.2027.2.498 Thu Apr 6 21:11:12 2006 +++ php-src/NEWSFri Apr 7 14:20:56 2006 @@ -1,6 +1,6 @@ PHPNEWS ||| -30 Mar 2006, PHP 5.1.3RC2 +06 Apr 2006, PHP 5.1.3RC3 - Fixed a bug that would not fill in the fifth argument to preg_replace() properly, if the variable was not declared previously. (Andrei) - Fixed safe_mode check for source argument of the copy() function. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/spl spl_directory.c
tony2001Thu Apr 6 19:01:56 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_directory.c
/php-srcNEWS
Log:
fix #36981 (SplFileObject-fgets() ignores max_length)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.26r2=1.45.2.27diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.26
php-src/ext/spl/spl_directory.c:1.45.2.27
--- php-src/ext/spl/spl_directory.c:1.45.2.26 Wed Mar 29 14:28:42 2006
+++ php-src/ext/spl/spl_directory.c Thu Apr 6 19:01:56 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.26 2006/03/29 14:28:42 tony2001 Exp $ */
+/* $Id: spl_directory.c,v 1.45.2.27 2006/04/06 19:01:56 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1327,7 +1327,7 @@
static int spl_filesystem_file_read(spl_filesystem_object *intern, int silent
TSRMLS_DC) /* {{{ */
{
char *buf;
- size_t line_len;
+ size_t line_len = 0;
int len;
long line_add = (intern-u.file.current_line ||
intern-u.file.current_zval) ? 1 : 0;
@@ -1340,7 +1340,17 @@
return FAILURE;
}
- buf = php_stream_get_line(intern-u.file.stream, NULL,
intern-u.file.max_line_len, line_len);
+ if (intern-u.file.max_line_len 0) {
+ buf = emalloc((intern-u.file.max_line_len + 1) * sizeof(char));
+ if (php_stream_get_line(intern-u.file.stream, buf,
intern-u.file.max_line_len, line_len) == NULL) {
+ efree(buf);
+ buf = NULL;
+ } else {
+ buf[line_len] = '\0';
+ }
+ } else {
+ buf = php_stream_get_line(intern-u.file.stream, NULL, 0,
line_len);
+ }
if (!buf) {
intern-u.file.current_line = estrdup();
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.496r2=1.2027.2.497diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.496 php-src/NEWS:1.2027.2.497
--- php-src/NEWS:1.2027.2.496 Thu Apr 6 02:39:55 2006
+++ php-src/NEWSThu Apr 6 19:01:56 2006
@@ -15,6 +15,7 @@
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed SoapFault::getMessage(). (Dmitry)
+- Fixed bug #36981 (SplFileObject-fgets() ignores max_length). (Tony)
- Fixed bug #36957 (serialize() does not handle recursion). (Ilia)
- Fixed bug #36944 (strncmp strncasecmp do not return false on negative
string length). (Tony)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
andrei Thu Apr 6 21:11:13 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.497r2=1.2027.2.498diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.497 php-src/NEWS:1.2027.2.498 --- php-src/NEWS:1.2027.2.497 Thu Apr 6 19:01:56 2006 +++ php-src/NEWSThu Apr 6 21:11:12 2006 @@ -1,6 +1,8 @@ PHPNEWS ||| 30 Mar 2006, PHP 5.1.3RC2 +- Fixed a bug that would not fill in the fifth argument to preg_replace() + properly, if the variable was not declared previously. (Andrei) - Fixed safe_mode check for source argument of the copy() function. (Ilia) - Fixed mysqli bigint conversion under Windows (Georg) - Fixed XSS inside phpinfo() with long inputs. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
georg Wed Apr 5 12:17:33 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: fixed bigint conversion errors (windows) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.493r2=1.2027.2.494diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.493 php-src/NEWS:1.2027.2.494 --- php-src/NEWS:1.2027.2.493 Wed Apr 5 11:36:13 2006 +++ php-src/NEWSWed Apr 5 12:17:33 2006 @@ -1,6 +1,7 @@ PHPNEWS ||| 30 Mar 2006, PHP 5.1.3RC2 +- Fixed mysqli bigint conversion under Windows (Georg) - Fixed XSS inside phpinfo() with long inputs. (Ilia) - Check 2nd parameter of tempnam() against path components. (Ilia) - Fixed Apache2 SAPIs header handler modifying header strings. (Mike) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
tony2001Wed Apr 5 14:08:18 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.494r2=1.2027.2.495diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.494 php-src/NEWS:1.2027.2.495 --- php-src/NEWS:1.2027.2.494 Wed Apr 5 12:17:33 2006 +++ php-src/NEWSWed Apr 5 14:08:18 2006 @@ -18,6 +18,8 @@ - Fixed bug #36944 (strncmp strncasecmp do not return false on negative string length). (Tony) - Fixed bug #36941 (ArrayIterator does not clone itself). (Marcus) +- Fixed bug #36934 (OCILob-read() doesn't move internal pointer when + reading 0's). (Tony) - Fixed bug #36898 (__set() leaks in classes extending internal ones). (Tony, Dmitry) - Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard file.c
iliaa Thu Apr 6 02:39:55 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard file.c
/php-srcNEWS
Log:
Fixed safe_mode check for source argument of the copy() function.
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.409.2.5r2=1.409.2.6diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.5
php-src/ext/standard/file.c:1.409.2.6
--- php-src/ext/standard/file.c:1.409.2.5 Mon Mar 27 23:40:41 2006
+++ php-src/ext/standard/file.c Thu Apr 6 02:39:55 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.5 2006/03/27 23:40:41 iliaa Exp $ */
+/* $Id: file.c,v 1.409.2.6 2006/04/06 02:39:55 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1767,7 +1767,7 @@
}
safe_to_copy:
- srcstream = php_stream_open_wrapper(src, rb,
STREAM_DISABLE_OPEN_BASEDIR | REPORT_ERRORS, NULL);
+ srcstream = php_stream_open_wrapper(src, rb, ENFORCE_SAFE_MODE |
REPORT_ERRORS, NULL);
if (!srcstream) {
return ret;
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.495r2=1.2027.2.496diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.495 php-src/NEWS:1.2027.2.496
--- php-src/NEWS:1.2027.2.495 Wed Apr 5 14:08:18 2006
+++ php-src/NEWSThu Apr 6 02:39:55 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
30 Mar 2006, PHP 5.1.3RC2
+- Fixed safe_mode check for source argument of the copy() function. (Ilia)
- Fixed mysqli bigint conversion under Windows (Georg)
- Fixed XSS inside phpinfo() with long inputs. (Ilia)
- Check 2nd parameter of tempnam() against path components. (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/spl spl_array.c /ext/spl/tests array_022.phpt bug36941.phpt
helly Tue Apr 4 19:53:21 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/spl/tests array_022.phpt bug36941.phpt
Modified files:
/php-srcNEWS
/php-src/ext/splspl_array.c
Log:
- MFH
. Fixed bug #36941 (ArrayIterator does not clone itself)
. Fixed SEGV when ArrayObject/Iterator use reference to self
. Added tests
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.490r2=1.2027.2.491diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.490 php-src/NEWS:1.2027.2.491
--- php-src/NEWS:1.2027.2.490 Thu Mar 30 19:19:20 2006
+++ php-src/NEWSTue Apr 4 19:53:21 2006
@@ -13,6 +13,7 @@
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed SoapFault::getMessage(). (Dmitry)
+- Fixed bug #36941 (ArrayIterator does not clone itself). (Marcus)
- Fixed bug #36898 (__set() leaks in classes extending internal ones).
(Tony, Dmitry)
- Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.15r2=1.71.2.16diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.15
php-src/ext/spl/spl_array.c:1.71.2.16
--- php-src/ext/spl/spl_array.c:1.71.2.15 Sat Apr 1 19:13:04 2006
+++ php-src/ext/spl/spl_array.c Tue Apr 4 19:53:21 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.15 2006/04/01 19:13:04 tony2001 Exp $ */
+/* $Id: spl_array.c,v 1.71.2.16 2006/04/04 19:53:21 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -67,7 +67,9 @@
} spl_array_object;
static inline HashTable *spl_array_get_hash_table(spl_array_object* intern,
int check_std_props TSRMLS_DC) {
- if ((intern-ar_flags SPL_ARRAY_USE_OTHER) (check_std_props == 0
|| (intern-ar_flags SPL_ARRAY_STD_PROP_LIST) == 0)) {
+ if ((intern-ar_flags SPL_ARRAY_IS_SELF) != 0) {
+ return intern-std.properties;
+ } else if ((intern-ar_flags SPL_ARRAY_USE_OTHER) (check_std_props
== 0 || (intern-ar_flags SPL_ARRAY_STD_PROP_LIST) == 0)) {
spl_array_object *other =
(spl_array_object*)zend_object_store_get_object(intern-array TSRMLS_CC);
return spl_array_get_hash_table(other, check_std_props
TSRMLS_CC);
} else if ((intern-ar_flags ((check_std_props ?
SPL_ARRAY_STD_PROP_LIST : 0) | SPL_ARRAY_IS_SELF)) != 0) {
@@ -112,8 +114,10 @@
}
/* }}} */
+zend_object_iterator *spl_array_get_iterator(zend_class_entry *ce, zval
*object TSRMLS_DC);
+
/* {{{ spl_array_object_new */
-static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type,
spl_array_object **obj, zval *orig TSRMLS_DC)
+static zend_object_value spl_array_object_new_ex(zend_class_entry *class_type,
spl_array_object **obj, zval *orig, int clone_orig TSRMLS_DC)
{
zend_object_value retval;
spl_array_object *intern;
@@ -130,13 +134,26 @@
zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
intern-ar_flags = 0;
+ intern-ce_get_iterator = spl_ce_ArrayIterator;
if (orig) {
spl_array_object *other =
(spl_array_object*)zend_object_store_get_object(orig TSRMLS_CC);
- intern-array = orig;
- ZVAL_ADDREF(intern-array);
intern-ar_flags = ~ SPL_ARRAY_CLONE_MASK;
- intern-ar_flags |= (other-ar_flags SPL_ARRAY_CLONE_MASK) |
SPL_ARRAY_IS_REF | SPL_ARRAY_USE_OTHER;
+ intern-ar_flags |= (other-ar_flags SPL_ARRAY_CLONE_MASK);
+ intern-ce_get_iterator = other-ce_get_iterator;
+ if (clone_orig) {
+ intern-array = other-array;
+ if (Z_OBJ_HT_P(orig) == spl_handler_ArrayObject) {
+ ZVAL_ADDREF(intern-array);
+ SEPARATE_ZVAL(intern-array);
+ ZVAL_ADDREF(other-array);
+ ZVAL_ADDREF(intern-array);
+ }
+ } else {
+ intern-array = orig;
+ ZVAL_ADDREF(intern-array);
+ intern-ar_flags |= SPL_ARRAY_IS_REF |
SPL_ARRAY_USE_OTHER;
+ }
} else {
MAKE_STD_ZVAL(intern-array);
array_init(intern-array);
@@ -145,7 +162,7 @@
retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) spl_array_object_free_storage, NULL
TSRMLS_CC);
while (parent) {
- if (parent == spl_ce_ArrayIterator) {
+ if (parent == spl_ce_ArrayIterator || parent ==
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard var.c
iliaa Wed Apr 5 02:28:06 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard var.c
/php-srcNEWS
Log:
Fixed bug #36957 (serialize() does not handle recursion).
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/var.c?r1=1.203.2.6r2=1.203.2.7diff_format=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.6
php-src/ext/standard/var.c:1.203.2.7
--- php-src/ext/standard/var.c:1.203.2.6Fri Mar 10 08:42:56 2006
+++ php-src/ext/standard/var.c Wed Apr 5 02:28:06 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var.c,v 1.203.2.6 2006/03/10 08:42:56 dmitry Exp $ */
+/* $Id: var.c,v 1.203.2.7 2006/04/05 02:28:06 iliaa Exp $ */
@@ -815,10 +815,18 @@
if (zend_hash_get_current_data_ex(myht,
(void **) data, pos) !=
SUCCESS
|| !data
- || data == struc) {
+ || data == struc
+ || (Z_TYPE_PP(data) == IS_ARRAY
Z_ARRVAL_PP(data)-nApplyCount 1)
+ ) {
smart_str_appendl(buf, N;, 2);
} else {
+ if (Z_TYPE_PP(data) ==
IS_ARRAY) {
+
Z_ARRVAL_PP(data)-nApplyCount++;
+ }
php_var_serialize_intern(buf,
data, var_hash TSRMLS_CC);
+ if (Z_TYPE_PP(data) ==
IS_ARRAY) {
+
Z_ARRVAL_PP(data)-nApplyCount--;
+ }
}
}
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.491r2=1.2027.2.492diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.491 php-src/NEWS:1.2027.2.492
--- php-src/NEWS:1.2027.2.491 Tue Apr 4 19:53:21 2006
+++ php-src/NEWSWed Apr 5 02:28:06 2006
@@ -13,6 +13,7 @@
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed SoapFault::getMessage(). (Dmitry)
+- Fixed bug #36957 (serialize() does not handle recursion). (Ilia)
- Fixed bug #36941 (ArrayIterator does not clone itself). (Marcus)
- Fixed bug #36898 (__set() leaks in classes extending internal ones).
(Tony, Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard info.c
iliaa Thu Mar 30 19:16:12 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard info.c
Log:
Fixed XSS inside phpinfo() with long inputs.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.488r2=1.2027.2.489diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.488 php-src/NEWS:1.2027.2.489
--- php-src/NEWS:1.2027.2.488 Wed Mar 29 14:28:40 2006
+++ php-src/NEWSThu Mar 30 19:16:12 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Mar 2006, PHP 5.1.3RC2
+- Fixed XSS inside phpinfo() with long inputs. (Ilia)
- Check 2nd parameter of tempnam() against path components. (Ilia)
- Fixed Apache2 SAPIs header handler modifying header strings. (Mike)
- Allowed 'auto_globals_jit' work together with 'register_argc_argv'. (Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/info.c?r1=1.249.2.7r2=1.249.2.8diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.7
php-src/ext/standard/info.c:1.249.2.8
--- php-src/ext/standard/info.c:1.249.2.7 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/info.c Thu Mar 30 19:16:12 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.7 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: info.c,v 1.249.2.8 2006/03/30 19:16:12 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -58,6 +58,21 @@
PHPAPI extern char *php_ini_opened_path;
PHPAPI extern char *php_ini_scanned_files;
+
+static int php_info_write_wrapper(const char *str, uint str_length)
+{
+ TSRMLS_FETCH();
+
+ int new_len, written;
+ char *elem_esc = php_escape_html_entities((char *)str, str_length,
new_len, 0, ENT_QUOTES, NULL TSRMLS_CC);
+
+ written = php_body_write(elem_esc, new_len TSRMLS_CC);
+
+ efree(elem_esc);
+
+ return written;
+}
+
/* {{{ _display_module_info
*/
@@ -135,30 +150,13 @@
PUTS( = );
}
if (Z_TYPE_PP(tmp) == IS_ARRAY) {
- zval *tmp3;
-
- MAKE_STD_ZVAL(tmp3);
-
if (!sapi_module.phpinfo_as_text) {
PUTS(pre);
- }
- php_start_ob_buffer(NULL, 4096, 1 TSRMLS_CC);
-
- zend_print_zval_r(*tmp, 0 TSRMLS_CC);
-
- php_ob_get_buffer(tmp3 TSRMLS_CC);
- php_end_ob_buffer(0, 0 TSRMLS_CC);
-
- if (!sapi_module.phpinfo_as_text) {
- elem_esc =
php_info_html_esc(Z_STRVAL_P(tmp3) TSRMLS_CC);
- PUTS(elem_esc);
- efree(elem_esc);
+ zend_print_zval_ex((zend_write_func_t)
php_info_write_wrapper, *tmp, 0 TSRMLS_CC);
PUTS(/pre);
} else {
- PUTS(Z_STRVAL_P(tmp3));
+ zend_print_zval_r(*tmp, 0 TSRMLS_CC);
}
- zval_ptr_dtor(tmp3);
-
} else if (Z_TYPE_PP(tmp) != IS_STRING) {
tmp2 = **tmp;
zval_copy_ctor(tmp2);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/com_dotnet com_persist.c /ext/date php_date.c /ext/dom php_dom.c /ext/mysqli mysqli.c /ext/reflection php_reflection.c /ext/simplexml simplexml.c /ex
tony2001Wed Mar 29 14:28:43 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/ZendEngine2zend_objects.c zend_objects.h
/php-src/ext/com_dotnet com_persist.c
/php-src/ext/date php_date.c
/php-src/ext/domphp_dom.c
/php-src/ext/mysqli mysqli.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/splspl_array.c spl_directory.c spl_iterators.c
spl_observer.c
/php-src/ext/sqlite sqlite.c
/php-src/ext/tidy tidy.c
/php-src/ext/xmlreader php_xmlreader.c
/php-src/ext/xmlwriter php_xmlwriter.c
/php-src/ext/xslphp_xsl.c
Log:
fix bug #36898 (__set() leaks in classes extending internal ones)
Added:
ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce
TSRMLS_DC)
ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC)
to initialize and destroy zend_object structs
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.487r2=1.2027.2.488diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.487 php-src/NEWS:1.2027.2.488
--- php-src/NEWS:1.2027.2.487 Tue Mar 28 16:01:04 2006
+++ php-src/NEWSWed Mar 29 14:28:40 2006
@@ -12,6 +12,8 @@
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed SoapFault::getMessage(). (Dmitry)
+- Fixed bug #36898 (__set() leaks in classes extending internal ones).
+ (Tony, Dmitry)
- Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia)
- Fixed bug #36878 (error messages are printed even though an exception has
been thrown). (Tony)
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_objects.c?r1=1.56.2.2r2=1.56.2.3diff_format=u
Index: ZendEngine2/zend_objects.c
diff -u ZendEngine2/zend_objects.c:1.56.2.2 ZendEngine2/zend_objects.c:1.56.2.3
--- ZendEngine2/zend_objects.c:1.56.2.2 Wed Jan 4 23:53:04 2006
+++ ZendEngine2/zend_objects.c Wed Mar 29 14:28:40 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_objects.c,v 1.56.2.2 2006/01/04 23:53:04 andi Exp $ */
+/* $Id: zend_objects.c,v 1.56.2.3 2006/03/29 14:28:40 tony2001 Exp $ */
#include zend.h
#include zend_globals.h
@@ -25,6 +25,26 @@
#include zend_API.h
#include zend_interfaces.h
+ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce
TSRMLS_DC)
+{
+ ALLOC_HASHTABLE(object-properties);
+ zend_hash_init(object-properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+
+ object-ce = ce;
+ object-guards = NULL;
+}
+
+ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC)
+{
+ if (object-guards) {
+ zend_hash_destroy(object-guards);
+ FREE_HASHTABLE(object-guards);
+ }
+ if (object-properties) {
+ zend_hash_destroy(object-properties);
+ FREE_HASHTABLE(object-properties);
+ }
+}
ZEND_API void zend_objects_destroy_object(zend_object *object,
zend_object_handle handle TSRMLS_DC)
{
@@ -88,12 +108,7 @@
ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC)
{
- if (object-guards) {
- zend_hash_destroy(object-guards);
- FREE_HASHTABLE(object-guards);
- }
- zend_hash_destroy(object-properties);
- FREE_HASHTABLE(object-properties);
+ zend_object_std_dtor(object TSRMLS_CC);
efree(object);
}
http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_objects.h?r1=1.25.2.1r2=1.25.2.2diff_format=u
Index: ZendEngine2/zend_objects.h
diff -u ZendEngine2/zend_objects.h:1.25.2.1 ZendEngine2/zend_objects.h:1.25.2.2
--- ZendEngine2/zend_objects.h:1.25.2.1 Wed Jan 4 23:53:04 2006
+++ ZendEngine2/zend_objects.h Wed Mar 29 14:28:40 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_objects.h,v 1.25.2.1 2006/01/04 23:53:04 andi Exp $ */
+/* $Id: zend_objects.h,v 1.25.2.2 2006/03/29 14:28:40 tony2001 Exp $ */
#ifndef ZEND_OBJECTS_H
#define ZEND_OBJECTS_H
@@ -25,6 +25,8 @@
#include zend.h
BEGIN_EXTERN_C()
+ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce
TSRMLS_DC);
+ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC);
ZEND_API zend_object_value zend_objects_new(zend_object **object,
zend_class_entry *class_type TSRMLS_DC);
ZEND_API void zend_objects_destroy_object(zend_object *object,
zend_object_handle handle TSRMLS_DC);
ZEND_API zend_object *zend_objects_get_address(zval *object TSRMLS_DC);
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_persist.c?r1=1.5.2.2r2=1.5.2.3diff_format=u
Index: php-src/ext/com_dotnet/com_persist.c
diff -u php-src/ext/com_dotnet/com_persist.c:1.5.2.2
php-src/ext/com_dotnet/com_persist.c:1.5.2.3
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/oci8 oci8_interface.c
tony2001Tue Mar 28 09:12:18 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/oci8 oci8_interface.c
Log:
fix #36851 (Documentation and code discrepancies for NULL data)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.485r2=1.2027.2.486diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.485 php-src/NEWS:1.2027.2.486
--- php-src/NEWS:1.2027.2.485 Mon Mar 27 23:40:41 2006
+++ php-src/NEWSTue Mar 28 09:12:17 2006
@@ -20,6 +20,8 @@
clone'ing). (Tony)
- Fixed bug #36857 (Added support for partial content fetching to the HTTP
streams wrapper). (Ilia)
+- Fixed bug #36851 (Documentation and code discrepancies for NULL data
+ in oci_fetch_*() functions). (Tony)
- Fixed bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause
segfault). (Tony)
- Fixed bug #36820 (Privileged connection with an Oracle password file fails).
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.6r2=1.8.2.7diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.6
php-src/ext/oci8/oci8_interface.c:1.8.2.7
--- php-src/ext/oci8/oci8_interface.c:1.8.2.6 Tue Mar 21 15:47:31 2006
+++ php-src/ext/oci8/oci8_interface.c Tue Mar 28 09:12:18 2006
@@ -25,7 +25,7 @@
+--+
*/
-/* $Id: oci8_interface.c,v 1.8.2.6 2006/03/21 15:47:31 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.8.2.7 2006/03/28 09:12:18 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1439,7 +1439,7 @@
Fetch a result row as an object */
PHP_FUNCTION(oci_fetch_object)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC, 2);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC |
PHP_OCI_RETURN_NULLS, 2);
if (Z_TYPE_P(return_value) == IS_ARRAY) {
object_and_properties_init(return_value,
ZEND_STANDARD_CLASS_DEF_PTR, Z_ARRVAL_P(return_value));
@@ -1451,7 +1451,7 @@
Fetch a result row as an enumerated array */
PHP_FUNCTION(oci_fetch_row)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_NUM, 1);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_NUM |
PHP_OCI_RETURN_NULLS, 1);
}
/* }}} */
@@ -1459,7 +1459,7 @@
Fetch a result row as an associative array */
PHP_FUNCTION(oci_fetch_assoc)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC, 1);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_ASSOC |
PHP_OCI_RETURN_NULLS, 1);
}
/* }}} */
@@ -1467,7 +1467,7 @@
Fetch a result row as an array */
PHP_FUNCTION(oci_fetch_array)
{
- php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_BOTH, 2);
+ php_oci_fetch_row(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_OCI_BOTH |
PHP_OCI_RETURN_NULLS, 2);
}
/* }}} */
@@ -1521,7 +1521,7 @@
}
/* }}} */
-/* {{{ proto resource oci_connect(string user, string pass [, string db])
+/* {{{ proto resource oci_connect(string user, string pass [, string db [,
string charset [, int session_mode ]])
Connect to an Oracle database and log on. Returns a new session. */
PHP_FUNCTION(oci_connect)
{
@@ -1529,7 +1529,7 @@
}
/* }}} */
-/* {{{ proto resource oci_pconnect(string user, string pass [, string db])
+/* {{{ proto resource oci_pconnect(string user, string pass [, string db [,
string charset ]])
Connect to an Oracle database using a persistent connection and log on.
Returns a new session. */
PHP_FUNCTION(oci_pconnect)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard user_filters.c
iliaa Tue Mar 28 16:01:04 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard user_filters.c
/php-srcNEWS
Log:
Fixed bug #36886 (User filters can leak buckets in some situations).
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/user_filters.c?r1=1.31.2.2r2=1.31.2.3diff_format=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.31.2.2
php-src/ext/standard/user_filters.c:1.31.2.3
--- php-src/ext/standard/user_filters.c:1.31.2.2Sun Feb 26 10:49:51 2006
+++ php-src/ext/standard/user_filters.c Tue Mar 28 16:01:04 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: user_filters.c,v 1.31.2.2 2006/02/26 10:49:51 helly Exp $ */
+/* $Id: user_filters.c,v 1.31.2.3 2006/03/28 16:01:04 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -64,6 +64,15 @@
static zend_class_entry user_filter_class_entry;
+static ZEND_RSRC_DTOR_FUNC(php_bucket_dtor)
+{
+ php_stream_bucket *bucket = (struct php_stream_bucket *)rsrc-ptr;
+ if (bucket) {
+ php_stream_bucket_delref(bucket TSRMLS_CC);
+ bucket = NULL;
+ }
+}
+
PHP_MINIT_FUNCTION(user_filters)
{
/* init the filter class ancestor */
@@ -83,7 +92,7 @@
/* Filters will dispose of their brigades */
le_bucket_brigade = zend_register_list_destructors_ex(NULL, NULL,
PHP_STREAM_BRIGADE_RES_NAME, module_number);
/* Brigades will dispose of their buckets */
- le_bucket = zend_register_list_destructors_ex(NULL, NULL,
PHP_STREAM_BUCKET_RES_NAME, module_number);
+ le_bucket = zend_register_list_destructors_ex(php_bucket_dtor, NULL,
PHP_STREAM_BUCKET_RES_NAME, module_number);
if (le_bucket_brigade == FAILURE) {
return FAILURE;
@@ -418,6 +427,12 @@
} else {
php_stream_bucket_prepend(brigade, bucket TSRMLS_CC);
}
+ /* This is a hack necessary to accomodate situations where bucket is
appended to the stream
+* multiple times. See bug35916.phpt for reference.
+*/
+ if (bucket-refcount == 1) {
+ bucket-refcount++;
+ }
}
/* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.486r2=1.2027.2.487diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.486 php-src/NEWS:1.2027.2.487
--- php-src/NEWS:1.2027.2.486 Tue Mar 28 09:12:17 2006
+++ php-src/NEWSTue Mar 28 16:01:04 2006
@@ -12,6 +12,7 @@
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed SoapFault::getMessage(). (Dmitry)
+- Fixed bug #36886 (User filters can leak buckets in some situations). (Ilia)
- Fixed bug #36878 (error messages are printed even though an exception has
been thrown). (Tony)
- Fixed bug #36869 (memory leak in output buffering when using chunked output).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main output.c
tony2001Mon Mar 27 08:26:10 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main output.c
/php-srcNEWS
Log:
fix #36869 (memory leak in output buffering when using chunked output)
http://cvs.php.net/viewcvs.cgi/php-src/main/output.c?r1=1.167.2.2r2=1.167.2.3diff_format=u
Index: php-src/main/output.c
diff -u php-src/main/output.c:1.167.2.2 php-src/main/output.c:1.167.2.3
--- php-src/main/output.c:1.167.2.2 Sun Jan 1 12:50:17 2006
+++ php-src/main/output.c Mon Mar 27 08:26:10 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: output.c,v 1.167.2.2 2006/01/01 12:50:17 sniper Exp $ */
+/* $Id: output.c,v 1.167.2.3 2006/03/27 08:26:10 tony2001 Exp $ */
#include php.h
#include ext/standard/head.h
@@ -606,11 +606,7 @@
/* If implicit_flush is On or chunked buffering, send contents to next
buffer and return. */
if (OG(active_ob_buffer).chunk_size
OG(active_ob_buffer).text_length =
OG(active_ob_buffer).chunk_size) {
- zval *output_handler = OG(active_ob_buffer).output_handler;
- if (output_handler) {
- output_handler-refcount++;
- }
php_end_ob_buffer(1, 1 TSRMLS_CC);
return;
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.482r2=1.2027.2.483diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.482 php-src/NEWS:1.2027.2.483
--- php-src/NEWS:1.2027.2.482 Sun Mar 26 17:12:05 2006
+++ php-src/NEWSMon Mar 27 08:26:10 2006
@@ -11,6 +11,8 @@
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed SoapFault::getMessage(). (Dmitry)
+- Fixed bug #36869 (memory leak in output buffering when using chunked output).
+ (Tony)
- Fixed bug #36859 (DOMElement crashes when calling __construct when
clone'ing). (Tony)
- Fixed bug #36857 (Added support for partial content fetching to the HTTP
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard file.c
iliaa Mon Mar 27 23:40:41 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard file.c
Log:
Check 2nd parameter of tempnam() against path components.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.484r2=1.2027.2.485diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.484 php-src/NEWS:1.2027.2.485
--- php-src/NEWS:1.2027.2.484 Mon Mar 27 22:07:37 2006
+++ php-src/NEWSMon Mar 27 23:40:41 2006
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Mar 2006, PHP 5.1.3RC2
+- Check 2nd parameter of tempnam() against path components. (Ilia)
- Fixed Apache2 SAPIs header handler modifying header strings. (Mike)
- Allowed 'auto_globals_jit' work together with 'register_argc_argv'. (Dmitry)
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.409.2.4r2=1.409.2.5diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.4
php-src/ext/standard/file.c:1.409.2.5
--- php-src/ext/standard/file.c:1.409.2.4 Fri Jan 13 04:05:59 2006
+++ php-src/ext/standard/file.c Mon Mar 27 23:40:41 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.4 2006/01/13 04:05:59 pajoye Exp $ */
+/* $Id: file.c,v 1.409.2.5 2006/03/27 23:40:41 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -773,8 +773,9 @@
zval **arg1, **arg2;
char *d;
char *opened_path;
- char p[64];
+ char *p;
int fd;
+ size_t p_len;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, arg1, arg2) ==
FAILURE) {
WRONG_PARAM_COUNT;
@@ -787,7 +788,11 @@
}
d = estrndup(Z_STRVAL_PP(arg1), Z_STRLEN_PP(arg1));
- strlcpy(p, Z_STRVAL_PP(arg2), sizeof(p));
+
+ php_basename(Z_STRVAL_PP(arg2), Z_STRLEN_PP(arg2), NULL, 0, p, p_len
TSRMLS_CC);
+ if (p_len 64) {
+ p[63] = '\0';
+ }
if ((fd = php_open_temporary_fd(d, p, opened_path TSRMLS_CC)) = 0) {
close(fd);
@@ -795,6 +800,7 @@
} else {
RETVAL_FALSE;
}
+ efree(p);
efree(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_1) / NEWS /ext/standard http_fopen_wrapper.c
iliaa Sun Mar 26 17:12:05 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard http_fopen_wrapper.c
/php-srcNEWS
Log:
Fixed bug #36857 (Added support for partial content fetching to the HTTP
streams wrapper).
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.99.2.9r2=1.99.2.10diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.99.2.9
php-src/ext/standard/http_fopen_wrapper.c:1.99.2.10
--- php-src/ext/standard/http_fopen_wrapper.c:1.99.2.9 Fri Jan 20 01:40:32 2006
+++ php-src/ext/standard/http_fopen_wrapper.c Sun Mar 26 17:12:05 2006
@@ -19,7 +19,7 @@
| Sara Golemon [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.99.2.9 2006/01/20 01:40:32 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.99.2.10 2006/03/26 17:12:05 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -493,6 +493,7 @@
}
switch(response_code) {
case 200:
+ case 206: /* partial content */
case 302:
case 303:
case 301:
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.481r2=1.2027.2.482diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.481 php-src/NEWS:1.2027.2.482
--- php-src/NEWS:1.2027.2.481 Sun Mar 26 00:23:25 2006
+++ php-src/NEWSSun Mar 26 17:12:05 2006
@@ -13,6 +13,8 @@
- Fixed SoapFault::getMessage(). (Dmitry)
- Fixed bug #36859 (DOMElement crashes when calling __construct when
clone'ing). (Tony)
+- Fixed bug #36857 (Added support for partial content fetching to the HTTP
+ streams wrapper). (Ilia)
- Fixed bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause
segfault). (Tony)
- Fixed bug #36820 (Privileged connection with an Oracle password file fails).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/dom php_dom.c
tony2001Sun Mar 26 00:23:25 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/domphp_dom.c /php-srcNEWS Log: fix #36859 (DOMElement crashes when calling __construct when clone'ing) http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.9r2=1.73.2.10diff_format=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.73.2.9 php-src/ext/dom/php_dom.c:1.73.2.10 --- php-src/ext/dom/php_dom.c:1.73.2.9 Sat Mar 18 11:44:49 2006 +++ php-src/ext/dom/php_dom.c Sun Mar 26 00:23:25 2006 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_dom.c,v 1.73.2.9 2006/03/18 11:44:49 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.73.2.10 2006/03/26 00:23:25 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -443,6 +443,7 @@ retval.handle = zend_objects_store_put(new_object, obj-dtor, obj-free_storage, obj-clone TSRMLS_CC); intern = (dom_object *) new_object; intern-handle = retval.handle; + intern-ptr = NULL; retval.handlers = Z_OBJ_HT_P(zobject); old_object = (dom_object *) obj-object; http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.480r2=1.2027.2.481diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.480 php-src/NEWS:1.2027.2.481 --- php-src/NEWS:1.2027.2.480 Fri Mar 24 12:10:38 2006 +++ php-src/NEWSSun Mar 26 00:23:25 2006 @@ -11,6 +11,8 @@ - Removed the E_STRICT deprecation notice from var. (Ilia) - Fixed debug_zval_dump() to support private and protected members. (Dmitry) - Fixed SoapFault::getMessage(). (Dmitry) +- Fixed bug #36859 (DOMElement crashes when calling __construct when + clone'ing). (Tony) - Fixed bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause segfault). (Tony) - Fixed bug #36820 (Privileged connection with an Oracle password file fails). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap soap.c
dmitry Fri Mar 24 08:45:54 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed SoapFault::getMessage()
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.478r2=1.2027.2.479diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.478 php-src/NEWS:1.2027.2.479
--- php-src/NEWS:1.2027.2.478 Wed Mar 22 21:56:40 2006
+++ php-src/NEWSFri Mar 24 08:45:54 2006
@@ -10,6 +10,7 @@
(also fixes bug #36764). (Tony)
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
+- Fixed SoapFault::getMessage(). (Dmitry)
- Fixed bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause
segfault). (Tony)
- Fixed bug #36820 (Privileged connection with an Oracle password file fails).
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.22r2=1.156.2.23diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.22 php-src/ext/soap/soap.c:1.156.2.23
--- php-src/ext/soap/soap.c:1.156.2.22 Thu Mar 23 10:44:39 2006
+++ php-src/ext/soap/soap.c Fri Mar 24 08:45:54 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.22 2006/03/23 10:44:39 helly Exp $ */
+/* $Id: soap.c,v 1.156.2.23 2006/03/24 08:45:54 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -818,6 +818,10 @@
zend_fcall_info fci;
zval fname;
+ if (ZEND_NUM_ARGS() 0) {
+ ZEND_WRONG_PARAM_COUNT();
+ }
+
faultcode = zend_read_property(soap_fault_class_entry, this_ptr,
faultcode, sizeof(faultcode)-1, 1 TSRMLS_CC);
faultstring = zend_read_property(soap_fault_class_entry, this_ptr,
faultstring, sizeof(faultstring)-1, 1 TSRMLS_CC);
file = zend_read_property(soap_fault_class_entry, this_ptr, file,
sizeof(file)-1, 1 TSRMLS_CC);
@@ -2985,6 +2989,9 @@
}
if (fault_string != NULL) {
add_property_string(obj, faultstring, fault_string, 1);
+#ifdef ZEND_ENGINE_2
+ zend_update_property_string(zend_exception_get_default(), obj,
message, sizeof(message)-1, fault_string TSRMLS_CC);
+#endif
}
if (fault_code != NULL) {
int soap_version = SOAP_GLOBAL(soap_version);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/mysqli mysqli.c /ext/mysqli/tests bug36745.phpt
georg Fri Mar 24 12:10:39 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/mysqli/tests bug36745.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mysqli mysqli.c
Log:
fix and testcase for bug #36745
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.479r2=1.2027.2.480diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.479 php-src/NEWS:1.2027.2.480
--- php-src/NEWS:1.2027.2.479 Fri Mar 24 08:45:54 2006
+++ php-src/NEWSFri Mar 24 12:10:38 2006
@@ -19,6 +19,8 @@
- Fixed bug #36808 (syslog ident becomes garbage between requests). (Tony)
- Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
(Ilia)
+- Fixed bug #36745 (No error message when load data local file isn't found).
+ (Georg)
- Fixed bug #36721 (The SoapServer is not able to send a header that it didn't
receive). (Dmitry)
- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli.c?r1=1.72.2.11r2=1.72.2.12diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.72.2.11
php-src/ext/mysqli/mysqli.c:1.72.2.12
--- php-src/ext/mysqli/mysqli.c:1.72.2.11 Fri Mar 24 09:32:24 2006
+++ php-src/ext/mysqli/mysqli.c Fri Mar 24 12:10:38 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.72.2.11 2006/03/24 09:32:24 georg Exp $
+ $Id: mysqli.c,v 1.72.2.12 2006/03/24 12:10:38 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -976,6 +976,7 @@
mysql-li_stream = php_stream_open_wrapper_ex((char *)filename, r, 0,
NULL, context);
if (mysql-li_stream == NULL) {
+ sprintf((char *)data-error_msg, Can't find file '%-.64s'.,
filename);
return 1;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/tests/bug36745.phpt?view=markuprev=1.1
Index: php-src/ext/mysqli/tests/bug36745.phpt
+++ php-src/ext/mysqli/tests/bug36745.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/oci8 oci8.c
tony2001Wed Mar 22 09:45:39 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8 oci8.c
/php-srcNEWS
Log:
fix #36820 (Privileged connection with an Oracle password file fails)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.11r2=1.269.2.12diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.11 php-src/ext/oci8/oci8.c:1.269.2.12
--- php-src/ext/oci8/oci8.c:1.269.2.11 Tue Mar 7 07:47:43 2006
+++ php-src/ext/oci8/oci8.c Wed Mar 22 09:45:39 2006
@@ -26,7 +26,7 @@
+--+
*/
-/* $Id: oci8.c,v 1.269.2.11 2006/03/07 07:47:43 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.12 2006/03/22 09:45:39 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -645,7 +645,7 @@
php_info_print_table_start();
php_info_print_table_row(2, OCI8 Support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.269.2.11 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.269.2.12 $);
sprintf(buf, %ld, OCI_G(num_persistent));
php_info_print_table_row(2, Active Persistent Connections, buf);
@@ -1286,7 +1286,11 @@
case OCI_SYSDBA:
case OCI_SYSOPER:
default:
- OCI_G(errcode) = PHP_OCI_CALL(OCISessionBegin,
(connection-svc, OCI_G(err), connection-session, (ub4) OCI_CRED_EXT, (ub4)
session_mode));
+ if (username_len == 1 username[0] == '/'
password_len == 0) {
+ OCI_G(errcode) =
PHP_OCI_CALL(OCISessionBegin, (connection-svc, OCI_G(err),
connection-session, (ub4) OCI_CRED_EXT, (ub4) session_mode));
+ } else {
+ OCI_G(errcode) =
PHP_OCI_CALL(OCISessionBegin, (connection-svc, OCI_G(err),
connection-session, (ub4) OCI_CRED_RDBMS, (ub4) session_mode));
+ }
break;
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.476r2=1.2027.2.477diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.476 php-src/NEWS:1.2027.2.477
--- php-src/NEWS:1.2027.2.476 Tue Mar 21 15:35:28 2006
+++ php-src/NEWSWed Mar 22 09:45:39 2006
@@ -10,6 +10,8 @@
(also fixes bug #36764). (Tony)
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
+- Fixed bug #36820 (Privileged connection with an Oracle password file fails).
+ (Tony)
- Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
- Fixed bug #36808 (syslog ident becomes garbage between requests). (Tony)
- Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/spl spl_array.c
tony2001Wed Mar 22 21:56:40 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/splspl_array.c
/php-srcNEWS
Log:
fix #36825 (Exceptions thrown in ArrayObject::offsetGet cause segfault)
fix similar issue in offsetExists()
remove redundant semicolons
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.10r2=1.71.2.11diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.10
php-src/ext/spl/spl_array.c:1.71.2.11
--- php-src/ext/spl/spl_array.c:1.71.2.10 Sun Mar 5 17:39:49 2006
+++ php-src/ext/spl/spl_array.c Wed Mar 22 21:56:39 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.10 2006/03/05 17:39:49 helly Exp $ */
+/* $Id: spl_array.c,v 1.71.2.11 2006/03/22 21:56:39 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -262,7 +262,11 @@
zend_call_method_with_1_params(object,
Z_OBJCE_P(object), intern-fptr_offset_get, offsetGet, rv, offset);
zval_ptr_dtor(intern-retval);
MAKE_STD_ZVAL(intern-retval);
- ZVAL_ZVAL(intern-retval, rv, 1, 1);
+ if (rv) {
+ ZVAL_ZVAL(intern-retval, rv, 1, 1);
+ } else {
+ ZVAL_NULL(intern-retval);
+ }
return intern-retval;
}
}
@@ -390,11 +394,13 @@
if (check_inherited intern-fptr_offset_has) {
zend_call_method_with_1_params(object, Z_OBJCE_P(object),
intern-fptr_offset_has, offsetExists, rv, offset);
- if (zend_is_true(rv)) {
+ if (rv zend_is_true(rv)) {
zval_ptr_dtor(rv);
return 1;
}
- zval_ptr_dtor(rv);
+ if (rv) {
+ zval_ptr_dtor(rv);
+ }
return 0;
}
@@ -1207,43 +1213,43 @@
static
ZEND_BEGIN_ARG_INFO(arginfo_array___construct, 0)
ZEND_ARG_INFO(0, array)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_offsetGet, 0, 0, 1)
ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO_EX(arginfo_array_offsetSet, 0, 0, 2)
ZEND_ARG_INFO(0, index)
ZEND_ARG_INFO(0, newval)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_array_append, 0)
ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_array_seek, 0)
ZEND_ARG_INFO(0, position)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_array_exchangeArray, 0)
ZEND_ARG_INFO(0, array)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_array_setFlags, 0)
ZEND_ARG_INFO(0, flags)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static
ZEND_BEGIN_ARG_INFO(arginfo_array_setIteratorClass, 0)
ZEND_ARG_INFO(0, iteratorClass)
-ZEND_END_ARG_INFO();
+ZEND_END_ARG_INFO()
static zend_function_entry spl_funcs_ArrayObject[] = {
SPL_ME(Array, __construct, arginfo_array___construct, ZEND_ACC_PUBLIC)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.477r2=1.2027.2.478diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.477 php-src/NEWS:1.2027.2.478
--- php-src/NEWS:1.2027.2.477 Wed Mar 22 09:45:39 2006
+++ php-src/NEWSWed Mar 22 21:56:40 2006
@@ -10,6 +10,8 @@
(also fixes bug #36764). (Tony)
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
+- Fixed bug #36825 (Exceptions thrown in ArrayObject::offsetGet cause
+ segfault). (Tony)
- Fixed bug #36820 (Privileged connection with an Oracle password file fails).
(Tony)
- Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /main main.c
dmitry Tue Mar 21 08:49:42 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/main main.c
Log:
Fixed bug #36809 (__FILE__ behavior changed)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.473r2=1.2027.2.474diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.473 php-src/NEWS:1.2027.2.474
--- php-src/NEWS:1.2027.2.473 Tue Mar 21 07:22:59 2006
+++ php-src/NEWSTue Mar 21 08:49:42 2006
@@ -10,6 +10,7 @@
(also fixes bug #36764). (Tony)
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
+- Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
- FIxed bug #36808 (syslog ident becomes garbage between requests). (Tony)
- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
- Fixed bug #36749 (SOAP: 'Error Fetching http body' when using HTTP Proxy).
http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.20r2=1.640.2.21diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.20 php-src/main/main.c:1.640.2.21
--- php-src/main/main.c:1.640.2.20 Tue Mar 14 15:16:07 2006
+++ php-src/main/main.c Tue Mar 21 08:49:42 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.640.2.20 2006/03/14 15:16:07 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.21 2006/03/21 08:49:42 dmitry Exp $ */
/* {{{ includes
*/
@@ -1696,6 +1696,7 @@
if (expand_filepath(primary_file-filename, realfile
TSRMLS_CC)) {
realfile_len = strlen(realfile);
zend_hash_add(EG(included_files), realfile,
realfile_len+1, (void *)dummy, sizeof(int), NULL);
+ primary_file-opened_path = estrndup(realfile,
realfile_len);
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/soap php_soap.h soap.c /ext/soap/tests server023.phpt server024.phpt server025.phpt server025.wsdl
dmitry Tue Mar 21 12:04:55 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/ext/soap/tests server023.phpt server024.phpt
server025.phpt server025.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap php_soap.h soap.c
Log:
Fixed bug #36721 (The SoapServer is not able to send a header that it didn't
receive)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.474r2=1.2027.2.475diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.474 php-src/NEWS:1.2027.2.475
--- php-src/NEWS:1.2027.2.474 Tue Mar 21 08:49:42 2006
+++ php-src/NEWSTue Mar 21 12:04:55 2006
@@ -11,7 +11,9 @@
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
-- FIxed bug #36808 (syslog ident becomes garbage between requests). (Tony)
+- Fixed bug #36808 (syslog ident becomes garbage between requests). (Tony)
+- Fixed bug #36721 (The SoapServer is not able to send a header that it didn't
+ receive). (Dmitry)
- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
- Fixed bug #36749 (SOAP: 'Error Fetching http body' when using HTTP Proxy).
(Dmitry)
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_soap.h?r1=1.38.2.3r2=1.38.2.4diff_format=u
Index: php-src/ext/soap/php_soap.h
diff -u php-src/ext/soap/php_soap.h:1.38.2.3
php-src/ext/soap/php_soap.h:1.38.2.4
--- php-src/ext/soap/php_soap.h:1.38.2.3Tue Feb 7 12:49:09 2006
+++ php-src/ext/soap/php_soap.h Tue Mar 21 12:04:55 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_soap.h,v 1.38.2.3 2006/02/07 12:49:09 dmitry Exp $ */
+/* $Id: php_soap.h,v 1.38.2.4 2006/03/21 12:04:55 dmitry Exp $ */
#ifndef PHP_SOAP_H
#define PHP_SOAP_H
@@ -97,6 +97,8 @@
} map_class;
};
+struct _soapHeader;
+
struct _soapService {
sdlPtr sdl;
@@ -120,6 +122,7 @@
xmlCharEncodingHandlerPtr encoding;
HashTable *class_map;
intfeatures;
+ struct _soapHeader **soap_headers_ptr;
};
#define SOAP_CLASS 1
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/soap.c?r1=1.156.2.19r2=1.156.2.20diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.19 php-src/ext/soap/soap.c:1.156.2.20
--- php-src/ext/soap/soap.c:1.156.2.19 Fri Mar 10 11:46:51 2006
+++ php-src/ext/soap/soap.c Tue Mar 21 12:04:55 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.19 2006/03/10 11:46:51 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.20 2006/03/21 12:04:55 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -244,6 +244,7 @@
PHP_METHOD(SoapServer, handle);
PHP_METHOD(SoapServer, setPersistence);
PHP_METHOD(SoapServer, fault);
+PHP_METHOD(SoapServer, addSoapHeader);
#ifdef HAVE_PHP_DOMXML
PHP_METHOD(PHP_SOAP_SERVER_CLASS, map);
#endif
@@ -309,6 +310,7 @@
PHP_ME(SoapServer, getFunctions, NULL, 0)
PHP_ME(SoapServer, handle, NULL, 0)
PHP_ME(SoapServer, fault, NULL, 0)
+ PHP_ME(SoapServer, addSoapHeader, NULL, 0)
#ifdef HAVE_PHP_DOMXML
PHP_ME(SoapServer, map, NULL, 0)
#endif
@@ -1518,6 +1520,8 @@
old_soap_version = SOAP_GLOBAL(soap_version);
function = deserialize_function_call(service-sdl, doc_request,
service-actor, function_name, num_params, params, soap_version,
soap_headers TSRMLS_CC);
xmlFreeDoc(doc_request);
+
+ service-soap_headers_ptr = soap_headers;
soap_obj = NULL;
if (service-type == SOAP_CLASS) {
@@ -1802,15 +1806,18 @@
int i;
soap_headers = soap_headers-next;
- i = h-num_params;
- while (i 0) {
- zval_ptr_dtor(h-parameters[--i]);
+ if (h-parameters) {
+ i = h-num_params;
+ while (i 0) {
+ zval_ptr_dtor(h-parameters[--i]);
+ }
+ efree(h-parameters);
}
- efree(h-parameters);
zval_dtor(h-function_name);
zval_dtor(h-retval);
efree(h);
}
+ service-soap_headers_ptr = NULL;
/* Free Memory */
if (num_params 0) {
@@ -1847,6 +1854,37 @@
}
/* }}} */
+PHP_METHOD(SoapServer, addSoapHeader)
+{
+ soapServicePtr service;
+ zval *fault;
+ soapHeader **p;
+
+ SOAP_SERVER_BEGIN_CODE();
+
+ FETCH_THIS_SERVICE(service);
+
+ if (!service || !service-soap_headers_ptr) {
+ php_error_docref(NULL TSRMLS_CC,
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/mysqli mysqli_nonapi.c
iliaa Tue Mar 21 15:35:29 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/mysqli mysqli_nonapi.c
/php-srcNEWS
Log:
Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
http://cvs.php.net/viewcvs.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.5r2=1.54.2.6diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.5
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.6
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.5 Sun Jan 1 12:50:09 2006
+++ php-src/ext/mysqli/mysqli_nonapi.c Tue Mar 21 15:35:28 2006
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.5 2006/01/01 12:50:09 sniper Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.6 2006/03/21 15:35:28 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -326,7 +326,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, mysql_link, mysqli_link);
- if (mysql_set_character_set(mysql-mysql, cs_name)) {
+ if (!mysql-mysql-thread_id || mysql_set_character_set(mysql-mysql,
cs_name)) {
RETURN_FALSE;
}
RETURN_TRUE;
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.475r2=1.2027.2.476diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.475 php-src/NEWS:1.2027.2.476
--- php-src/NEWS:1.2027.2.475 Tue Mar 21 12:04:55 2006
+++ php-src/NEWSTue Mar 21 15:35:28 2006
@@ -12,6 +12,8 @@
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
- Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
- Fixed bug #36808 (syslog ident becomes garbage between requests). (Tony)
+- Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
+ (Ilia)
- Fixed bug #36721 (The SoapServer is not able to send a header that it didn't
receive). (Dmitry)
- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard basic_functions.c php_ext_syslog.h syslog.c
tony2001Mon Mar 20 23:03:11 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard basic_functions.c php_ext_syslog.h syslog.c
/php-srcNEWS
Log:
fix #36808 (syslog ident becomes garbage between requests)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.25r2=1.725.2.26diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.25
php-src/ext/standard/basic_functions.c:1.725.2.26
--- php-src/ext/standard/basic_functions.c:1.725.2.25 Sun Mar 5 18:57:54 2006
+++ php-src/ext/standard/basic_functions.c Mon Mar 20 23:03:11 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.25 2006/03/05 18:57:54 derick Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.26 2006/03/20 23:03:11 tony2001 Exp $ */
#include php.h
#include php_streams.h
@@ -1150,6 +1150,7 @@
PHP_MSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_MSHUTDOWN(file)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_MSHUTDOWN(standard_filters)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+ PHP_MSHUTDOWN(syslog)(INIT_FUNC_ARGS_PASSTHRU);
#if defined(HAVE_LOCALECONV) defined(ZTS)
PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_ext_syslog.h?r1=1.12.2.1r2=1.12.2.2diff_format=u
Index: php-src/ext/standard/php_ext_syslog.h
diff -u php-src/ext/standard/php_ext_syslog.h:1.12.2.1
php-src/ext/standard/php_ext_syslog.h:1.12.2.2
--- php-src/ext/standard/php_ext_syslog.h:1.12.2.1 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/php_ext_syslog.h Mon Mar 20 23:03:11 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_ext_syslog.h,v 1.12.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: php_ext_syslog.h,v 1.12.2.2 2006/03/20 23:03:11 tony2001 Exp $ */
#ifndef PHP_EXT_SYSLOG_H
#define PHP_EXT_SYSLOG_H
@@ -28,6 +28,7 @@
PHP_MINIT_FUNCTION(syslog);
PHP_RINIT_FUNCTION(syslog);
PHP_RSHUTDOWN_FUNCTION(syslog);
+PHP_MSHUTDOWN_FUNCTION(syslog);
PHP_FUNCTION(openlog);
PHP_FUNCTION(syslog);
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/syslog.c?r1=1.49.2.1r2=1.49.2.2diff_format=u
Index: php-src/ext/standard/syslog.c
diff -u php-src/ext/standard/syslog.c:1.49.2.1
php-src/ext/standard/syslog.c:1.49.2.2
--- php-src/ext/standard/syslog.c:1.49.2.1 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/syslog.c Mon Mar 20 23:03:11 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: syslog.c,v 1.49.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: syslog.c,v 1.49.2.2 2006/03/20 23:03:11 tony2001 Exp $ */
#include php.h
@@ -97,6 +97,7 @@
/* AIX doesn't have LOG_PERROR */
REGISTER_LONG_CONSTANT(LOG_PERROR, LOG_PERROR, CONST_CS |
CONST_PERSISTENT); /*log to stderr*/
#endif
+ BG(syslog_device)=NULL;
return SUCCESS;
}
@@ -109,22 +110,26 @@
} else {
BG(syslog_started)=0;
}
- BG(syslog_device)=NULL;
return SUCCESS;
}
PHP_RSHUTDOWN_FUNCTION(syslog)
{
- if (BG(syslog_device)) {
- efree(BG(syslog_device));
- }
#ifdef PHP_WIN32
closelog();
#endif
return SUCCESS;
}
+PHP_MSHUTDOWN_FUNCTION(syslog)
+{
+ if (BG(syslog_device)) {
+ free(BG(syslog_device));
+ }
+ return SUCCESS;
+}
+
/* {{{ start_syslog
*/
static void start_syslog(TSRMLS_D)
@@ -224,9 +229,9 @@
return;
}
if (BG(syslog_device)) {
- efree(BG(syslog_device));
+ free(BG(syslog_device));
}
- BG(syslog_device) = estrndup(ident, ident_len);
+ BG(syslog_device) = zend_strndup(ident, ident_len);
openlog(BG(syslog_device), option, facility);
RETURN_TRUE;
}
@@ -242,7 +247,7 @@
closelog();
if (BG(syslog_device)) {
- efree(BG(syslog_device));
+ free(BG(syslog_device));
BG(syslog_device)=NULL;
}
RETURN_TRUE;
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.470r2=1.2027.2.471diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.470 php-src/NEWS:1.2027.2.471
--- php-src/NEWS:1.2027.2.470 Sun Mar 19 15:19:08 2006
+++ php-src/NEWSMon Mar 20 23:03:11 2006
@@ -10,6 +10,7 @@
(also fixes bug #36764). (Tony)
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
+- FIxed bug #36808 (syslog ident becomes garbage between requests). (Tony)
- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob)
- Fixed bug #36743 (In a class extending XMLReader array properties are not
writable). (Tony)
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard syslog.c
iliaa Tue Mar 21 00:59:09 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/standard syslog.c /php-srcNEWS Log: Fixed bug #36689 (Removed arbitrary limit on the length of syslog messages). http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/syslog.c?r1=1.49.2.2r2=1.49.2.3diff_format=u Index: php-src/ext/standard/syslog.c diff -u php-src/ext/standard/syslog.c:1.49.2.2 php-src/ext/standard/syslog.c:1.49.2.3 --- php-src/ext/standard/syslog.c:1.49.2.2 Mon Mar 20 23:03:11 2006 +++ php-src/ext/standard/syslog.c Tue Mar 21 00:59:08 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: syslog.c,v 1.49.2.2 2006/03/20 23:03:11 tony2001 Exp $ */ +/* $Id: syslog.c,v 1.49.2.3 2006/03/21 00:59:08 iliaa Exp $ */ #include php.h @@ -267,12 +267,7 @@ return; } - /* -* CAVEAT: if the message contains patterns such as %s, -* this will cause problems. -*/ - - php_syslog(priority, %.500s, message); + php_syslog(priority, %s, message); RETURN_TRUE; } /* }}} */ http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.471r2=1.2027.2.472diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.471 php-src/NEWS:1.2027.2.472 --- php-src/NEWS:1.2027.2.471 Mon Mar 20 23:03:11 2006 +++ php-src/NEWSTue Mar 21 00:59:08 2006 @@ -18,6 +18,8 @@ defined). (Tony) - Fixed bug #36697 (Transparency is lost when using imagecreatetruecolor). (Pierre) +- Fixed bug #36689 (Removed arbitrary limit on the length of syslog messages). + (Ilia) - Fixed bug #36629 (SoapServer::handle() exits on SOAP faults). (Dmitry) - Fixed Bug #36614 (Segfault when using Soap). (Dmitry) - Fixed bug #36568 (memory_limit setting on win32 has no effect). (Dmitry) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
dmitry Tue Mar 21 07:23:00 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Fixed bug #36749 (SOAP: 'Error Fetching http body' when using HTTP Proxy) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.472r2=1.2027.2.473diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.472 php-src/NEWS:1.2027.2.473 --- php-src/NEWS:1.2027.2.472 Tue Mar 21 00:59:08 2006 +++ php-src/NEWSTue Mar 21 07:22:59 2006 @@ -12,6 +12,8 @@ - Fixed debug_zval_dump() to support private and protected members. (Dmitry) - FIxed bug #36808 (syslog ident becomes garbage between requests). (Tony) - Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob) +- Fixed bug #36749 (SOAP: 'Error Fetching http body' when using HTTP Proxy). + (Dmitry) - Fixed bug #36743 (In a class extending XMLReader array properties are not writable). (Tony) - Fixed bug #36727 (segfault in pdo_pgsql bindValue() when no parameters are -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
mikeSun Mar 19 15:18:20 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - Fixed Apache2 SAPIs header handler modifying header strings. http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.468r2=1.2027.2.469diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.468 php-src/NEWS:1.2027.2.469 --- php-src/NEWS:1.2027.2.468 Sat Mar 18 22:06:31 2006 +++ php-src/NEWSSun Mar 19 15:18:20 2006 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Mar 2006, PHP 5.1.3RC2 +- Fixed Apache2 SAPIs header handler modifying header strings. - Allowed 'auto_globals_jit' work together with 'register_argc_argv'. (Dmitry) - Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) - Fixed offset/length parameter validation in substr_compare() function. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
mikeSun Mar 19 15:19:08 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - add comitters name http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.469r2=1.2027.2.470diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.469 php-src/NEWS:1.2027.2.470 --- php-src/NEWS:1.2027.2.469 Sun Mar 19 15:18:20 2006 +++ php-src/NEWSSun Mar 19 15:19:08 2006 @@ -1,7 +1,7 @@ PHPNEWS ||| ?? Mar 2006, PHP 5.1.3RC2 -- Fixed Apache2 SAPIs header handler modifying header strings. +- Fixed Apache2 SAPIs header handler modifying header strings. (Mike) - Allowed 'auto_globals_jit' work together with 'register_argc_argv'. (Dmitry) - Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) - Fixed offset/length parameter validation in substr_compare() function. (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
rrichards Sat Mar 18 11:47:06 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.466r2=1.2027.2.467diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.466 php-src/NEWS:1.2027.2.467 --- php-src/NEWS:1.2027.2.466 Fri Mar 17 22:15:57 2006 +++ php-src/NEWSSat Mar 18 11:47:05 2006 @@ -7,6 +7,7 @@ - Added overflow checks to wordwrap() function. (Ilia) - Removed the E_STRICT deprecation notice from var. (Ilia) - Fixed debug_zval_dump() to support private and protected members. (Dmitry) +- Fixed bug #36756 (DOMDocument::removeChild corrupts node). (Rob) - Fixed bug #36743 (In a class extending XMLReader array properties are not writable). (Tony) - Fixed bug #36727 (segfault in pdo_pgsql bindValue() when no parameters are -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
