[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Fri Feb 4 20:34:50 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.631r2=1.632ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.631 ZendEngine2/ChangeLog:1.632 --- ZendEngine2/ChangeLog:1.631 Thu Feb 3 20:34:25 2005 +++ ZendEngine2/ChangeLog Fri Feb 4 20:34:50 2005 @@ -1,3 +1,10 @@ +2005-02-04 Hartmut Holzgraefe [EMAIL PROTECTED] + +* zend_API.c + zend_API.h: + added some missing zend_[declare|update]_property_...() convenience + functions for bool, double and binary safe string data + 2005-02-03 Jani Taskinen [EMAIL PROTECTED] * (PHP_5_0) @@ -6966,7 +6973,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.631 2005/02/04 01:34:25 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.632 2005/02/05 01:34:50 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -8690,7 +8697,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.631 2005/02/04 01:34:25 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.632 2005/02/05 01:34:50 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c
sniper Fri Feb 4 05:39:34 2005 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
- Fixed bug #28227 (PHP CGI depends upon non-standard SCRIPT_FILENAME)
# patch by: lukem at NetBSD dot org
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.259r2=1.260ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.259 php-src/sapi/cgi/cgi_main.c:1.260
--- php-src/sapi/cgi/cgi_main.c:1.259 Tue Jan 11 08:35:56 2005
+++ php-src/sapi/cgi/cgi_main.c Fri Feb 4 05:39:33 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.259 2005/01/11 13:35:56 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.260 2005/02/04 10:39:33 sniper Exp $ */
#include php.h
#include php_globals.h
@@ -662,8 +662,19 @@
{
char *env_script_filename = sapi_cgibin_getenv(SCRIPT_FILENAME,0
TSRMLS_CC);
char *env_path_translated = sapi_cgibin_getenv(PATH_TRANSLATED,0
TSRMLS_CC);
+ char *env_script_name = sapi_cgibin_getenv(SCRIPT_NAME, 0 TSRMLS_CC);
char *script_path_translated = env_script_filename;
+ /*
+* CGI/1.1, as documented at: http://cgi-spec.golux.com/
+* mentions SCRIPT_NAME but not SCRIPT_FILENAME.
+*/
+ if (!script_path_translated env_script_name *env_script_name ==
'/') {
+ env_script_filename =
_sapi_cgibin_putenv(SCRIPT_FILENAME,(env_script_name + 1) TSRMLS_CC);
+
+ script_path_translated = env_script_filename;
+ }
+
#if !DISCARD_PATH
/* some broken servers do not have script_filename or argv0
an example, IIS configured in some ways. then they do more
@@ -691,7 +702,6 @@
char *content_length = sapi_cgibin_getenv(CONTENT_LENGTH,0
TSRMLS_CC);
char *content_type = sapi_cgibin_getenv(CONTENT_TYPE,0
TSRMLS_CC);
char *env_path_info = sapi_cgibin_getenv(PATH_INFO,0
TSRMLS_CC);
- char *env_script_name = sapi_cgibin_getenv(SCRIPT_NAME,0
TSRMLS_CC);
#if ENABLE_PATHINFO_CHECK
struct stat st;
char *env_redirect_url = sapi_cgibin_getenv(REDIRECT_URL,0
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Hello
Try this game ;-) +++ Attachment: No Virus found +++ MessageLabs AntiVirus - www.messagelabs.com -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard datetime.c
sniper Fri Feb 4 08:09:09 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard datetime.c
Log:
MFH: Fixed bug #31842 (*date('r') does not return RFC2822 conforming date
string).
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.121.2.2r2=1.121.2.3ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.121.2.2
php-src/ext/standard/datetime.c:1.121.2.3
--- php-src/ext/standard/datetime.c:1.121.2.2 Wed Dec 15 19:12:56 2004
+++ php-src/ext/standard/datetime.c Fri Feb 4 08:09:09 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.121.2.2 2004/12/16 00:12:56 iliaa Exp $ */
+/* $Id: datetime.c,v 1.121.2.3 2005/02/04 13:09:09 sniper Exp $ */
#include php.h
#include zend_operators.h
@@ -582,7 +582,7 @@
break;
case 'r':
#if HAVE_TM_GMTOFF
- sprintf(tmp_buff, %3s, %2d %3s %04d
%02d:%02d:%02d %c%02d%02d,
+ sprintf(tmp_buff, %3s, %02d %3s %04d
%02d:%02d:%02d %c%02d%02d,
day_short_names[ta-tm_wday],
ta-tm_mday,
mon_short_names[ta-tm_mon],
@@ -595,7 +595,7 @@
abs( (ta-tm_gmtoff % 3600) / 60 )
);
#else
- sprintf(tmp_buff, %3s, %2d %3s %04d
%02d:%02d:%02d %c%02d%02d,
+ sprintf(tmp_buff, %3s, %02d %3s %04d
%02d:%02d:%02d %c%02d%02d,
day_short_names[ta-tm_wday],
ta-tm_mday,
mon_short_names[ta-tm_mon],
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/standard datetime.c
sniper Fri Feb 4 08:09:25 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-srcNEWS
/php-src/ext/standard datetime.c
Log:
MFH: Fixed bug #31842 (*date('r') does not return RFC2822 conforming date
string).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.828r2=1.1247.2.829ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.828 php-src/NEWS:1.1247.2.829
--- php-src/NEWS:1.1247.2.828 Fri Feb 4 05:42:00 2005
+++ php-src/NEWSFri Feb 4 08:09:24 2005
@@ -6,6 +6,8 @@
- Fixed several egregious leaks in ext/browscap and sapi/embed. (Andrei)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed MacOSX shared extensions crashing on Apache startup. (Rasmus)
+- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
+ (Jani)
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
- Fixed bug #31796 (readline completion handler does not handle empty return
values). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.96.2.17r2=1.96.2.18ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.96.2.17
php-src/ext/standard/datetime.c:1.96.2.18
--- php-src/ext/standard/datetime.c:1.96.2.17 Wed Dec 15 19:10:55 2004
+++ php-src/ext/standard/datetime.c Fri Feb 4 08:09:24 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.96.2.17 2004/12/16 00:10:55 iliaa Exp $ */
+/* $Id: datetime.c,v 1.96.2.18 2005/02/04 13:09:24 sniper Exp $ */
#include php.h
#include zend_operators.h
@@ -579,7 +579,7 @@
break;
case 'r':
#if HAVE_TM_GMTOFF
- sprintf(tmp_buff, %3s, %2d %3s %04d
%02d:%02d:%02d %c%02d%02d,
+ sprintf(tmp_buff, %3s, %02d %3s %04d
%02d:%02d:%02d %c%02d%02d,
day_short_names[ta-tm_wday],
ta-tm_mday,
mon_short_names[ta-tm_mon],
@@ -592,7 +592,7 @@
abs( (ta-tm_gmtoff % 3600) / 60 )
);
#else
- sprintf(tmp_buff, %3s, %2d %3s %04d
%02d:%02d:%02d %c%02d%02d,
+ sprintf(tmp_buff, %3s, %02d %3s %04d
%02d:%02d:%02d %c%02d%02d,
day_short_names[ta-tm_wday],
ta-tm_mday,
mon_short_names[ta-tm_mon],
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
sniper Fri Feb 4 08:10:19 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
Log:
BFN
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.232r2=1.1760.2.233ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.232 php-src/NEWS:1.1760.2.233
--- php-src/NEWS:1.1760.2.232 Fri Feb 4 05:41:01 2005
+++ php-src/NEWSFri Feb 4 08:10:19 2005
@@ -15,6 +15,8 @@
is passed. (Tony)
- Fixed posix_getsid() posix_getpgid() to return sid pgid instead
of true. (Tony)
+- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
+ (Jani)
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
- Fixed bug #31796 (readline completion handler does not handle empty return
values). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dbase dbase.c /ext/dbase/tests bug31754.phpt
derick Fri Feb 4 09:28:50 2005 EDT
Added files:
/php-src/ext/dbase/testsbug31754.phpt
Modified files:
/php-src/ext/dbase dbase.c
Log:
- Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
http://cvs.php.net/diff.php/php-src/ext/dbase/dbase.c?r1=1.72r2=1.73ty=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.72 php-src/ext/dbase/dbase.c:1.73
--- php-src/ext/dbase/dbase.c:1.72 Thu Jan 8 03:15:07 2004
+++ php-src/ext/dbase/dbase.c Fri Feb 4 09:28:50 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbase.c,v 1.72 2004/01/08 08:15:07 andi Exp $ */
+/* $Id: dbase.c,v 1.73 2005/02/04 14:28:50 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -129,6 +129,11 @@
convert_to_string_ex(dbf_name);
convert_to_long_ex(options);
+ if (Z_LVAL_PP(options) == 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot open %s in
write-only mode, Z_STRVAL_PP(dbf_name));
+ RETURN_FALSE;
+ }
+
if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(dbf_name), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}
http://cvs.php.net/co.php/php-src/ext/dbase/tests/bug31754.phpt?r=1.1p=1
Index: php-src/ext/dbase/tests/bug31754.phpt
+++ php-src/ext/dbase/tests/bug31754.phpt
--TEST--
Bug #31754: (dbase_open() fails for mode = 1)
--SKIPIF--
?php
if (!extension_loaded('dbase')) {
die('skip dbase extension not available');
}
?
--FILE--
?php
// database definition
$def = array(
array(foo, L)
);
// creation
$dbh = dbase_create('/tmp/bug31754.dbf', array(array('foo', 'L')));
dbase_close($dbh);
$dbh = dbase_open('/tmp/bug31754.dbf', 1);
unlink('/tmp/bug31754.dbf');
?
--EXPECTF--
Warning: dbase_open(): Cannot open /tmp/bug31754.dbf in write-only mode in
%sbug31754.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/dbase dbase.c /ext/dbase/tests bug31754.phpt
derick Fri Feb 4 09:29:06 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/dbase/testsbug31754.phpt
Modified files:
/php-srcNEWS
/php-src/ext/dbase dbase.c
Log:
- MFH: Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.233r2=1.1760.2.234ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.233 php-src/NEWS:1.1760.2.234
--- php-src/NEWS:1.1760.2.233 Fri Feb 4 08:10:19 2005
+++ php-src/NEWSFri Feb 4 09:29:05 2005
@@ -21,6 +21,7 @@
- Fixed bug #31796 (readline completion handler does not handle empty return
values). (Ilia)
- Fixed bug #31755 (Cannot create SOAP header in no namespace). (Dmitry)
+- Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
- Fixed bug #31747 (SOAP Digest Authentication doesn't work with
HTTP/1.1 100 Continue response). (Dmitry)
- Fixed bug #31732 (mb_get_info() causes segfault when no parameters
http://cvs.php.net/diff.php/php-src/ext/dbase/dbase.c?r1=1.72r2=1.72.2.1ty=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.72 php-src/ext/dbase/dbase.c:1.72.2.1
--- php-src/ext/dbase/dbase.c:1.72 Thu Jan 8 03:15:07 2004
+++ php-src/ext/dbase/dbase.c Fri Feb 4 09:29:05 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbase.c,v 1.72 2004/01/08 08:15:07 andi Exp $ */
+/* $Id: dbase.c,v 1.72.2.1 2005/02/04 14:29:05 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -129,6 +129,11 @@
convert_to_string_ex(dbf_name);
convert_to_long_ex(options);
+ if (Z_LVAL_PP(options) == 1) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Cannot open %s in
write-only mode, Z_STRVAL_PP(dbf_name));
+ RETURN_FALSE;
+ }
+
if (PG(safe_mode) (!php_checkuid(Z_STRVAL_PP(dbf_name), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}
http://cvs.php.net/co.php/php-src/ext/dbase/tests/bug31754.phpt?r=1.1p=1
Index: php-src/ext/dbase/tests/bug31754.phpt
+++ php-src/ext/dbase/tests/bug31754.phpt
--TEST--
Bug #31754: (dbase_open() fails for mode = 1)
--SKIPIF--
?php
if (!extension_loaded('dbase')) {
die('skip dbase extension not available');
}
?
--FILE--
?php
// database definition
$def = array(
array(foo, L)
);
// creation
$dbh = dbase_create('/tmp/bug31754.dbf', array(array('foo', 'L')));
dbase_close($dbh);
$dbh = dbase_open('/tmp/bug31754.dbf', 1);
unlink('/tmp/bug31754.dbf');
?
--EXPECTF--
Warning: dbase_open(): Cannot open /tmp/bug31754.dbf in write-only mode in
%sbug31754.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS /ext/dbase dbase.c /ext/dbase/tests bug31754.phpt
derick Fri Feb 4 09:29:21 2005 EDT
Added files: (Branch: PHP_4_3)
/php-src/ext/dbase/testsbug31754.phpt
Modified files:
/php-srcNEWS
/php-src/ext/dbase dbase.c
Log:
- MFH: Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.829r2=1.1247.2.830ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.829 php-src/NEWS:1.1247.2.830
--- php-src/NEWS:1.1247.2.829 Fri Feb 4 08:09:24 2005
+++ php-src/NEWSFri Feb 4 09:29:20 2005
@@ -11,6 +11,7 @@
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
- Fixed bug #31796 (readline completion handler does not handle empty return
values). (Ilia)
+- Fixed bug #31754 (dbase_open() fails for mode = 1). (Mehdi, Derick)
- Fixed bug #31705 (parse_url() does not recognize http://foo.com#bar). (Ilia)
- Fixed bug #31684 (dio_tcsetattr(): misconfigured termios settings).
(elod at itfais dot com)
http://cvs.php.net/diff.php/php-src/ext/dbase/dbase.c?r1=1.60.2.3r2=1.60.2.4ty=u
Index: php-src/ext/dbase/dbase.c
diff -u php-src/ext/dbase/dbase.c:1.60.2.3 php-src/ext/dbase/dbase.c:1.60.2.4
--- php-src/ext/dbase/dbase.c:1.60.2.3 Tue Nov 4 01:09:19 2003
+++ php-src/ext/dbase/dbase.c Fri Feb 4 09:29:20 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dbase.c,v 1.60.2.3 2003/11/04 06:09:19 sniper Exp $ */
+/* $Id: dbase.c,v 1.60.2.4 2005/02/04 14:29:20 derick Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -129,6 +129,11 @@
convert_to_string(dbf_name);
convert_to_long(options);
+ if (Z_LVAL_P(options) == 1) {
+ php_error(E_WARNING, Cannot open %s in write-only mode,
Z_STRVAL_P(dbf_name));
+ RETURN_FALSE;
+ }
+
if (PG(safe_mode) (!php_checkuid(Z_STRVAL_P(dbf_name), NULL,
CHECKUID_CHECK_FILE_AND_DIR))) {
RETURN_FALSE;
}
http://cvs.php.net/co.php/php-src/ext/dbase/tests/bug31754.phpt?r=1.1p=1
Index: php-src/ext/dbase/tests/bug31754.phpt
+++ php-src/ext/dbase/tests/bug31754.phpt
--TEST--
Bug #31754: (dbase_open() fails for mode = 1)
--SKIPIF--
?php
if (!extension_loaded('dbase')) {
die('skip dbase extension not available');
}
?
--FILE--
?php
// database definition
$def = array(
array(foo, L)
);
// creation
$dbh = dbase_create('/tmp/bug31754.dbf', array(array('foo', 'L')));
dbase_close($dbh);
$dbh = dbase_open('/tmp/bug31754.dbf', 1);
unlink('/tmp/bug31754.dbf');
?
--EXPECTF--
Warning: dbase_open(): Cannot open /tmp/bug31754.dbf in write-only mode in
%sbug31754.php on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
wez Fri Feb 4 10:37:10 2005 EDT Modified files: /CVSROOTavail Log: karma for maxdb for the other Thomas at SAP http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.934r2=1.935ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.934 CVSROOT/avail:1.935 --- CVSROOT/avail:1.934 Mon Jan 31 07:47:50 2005 +++ CVSROOT/avail Fri Feb 4 10:37:10 2005 @@ -242,7 +242,7 @@ avail|ccollie|pecl/i18n avail|mksheoran|pecl/daffodildb avail|val|pecl/bcompiler,phpdoc -avail|simenec|pecl/maxdb,phpdoc/en/reference +avail|simenec,ttk|pecl/maxdb,phpdoc/en/reference avail|ryansking|pear/Config avail|ksadlocha|pecl/simplesql avail|cipri|pear/Mail_Mime,pear/File_DNS -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/soap soap.c
dmitry Fri Feb 4 10:42:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #31832 (SOAP encoding problem with complex types in WSDL mode with
multiple parts)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.234r2=1.1760.2.235ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.234 php-src/NEWS:1.1760.2.235
--- php-src/NEWS:1.1760.2.234 Fri Feb 4 09:29:05 2005
+++ php-src/NEWSFri Feb 4 10:42:27 2005
@@ -17,6 +17,8 @@
of true. (Tony)
- Fixed bug #31842 (*date('r') does not return RFC2822 conforming date string).
(Jani)
+- Fixed bug #31832 (SOAP encoding problem with complex types in WSDL mode with
+ multiple parts). (Dmitry)
- Fixed bug #31797 (exif_read_data() uses too low nesting limit). (Ilia)
- Fixed bug #31796 (readline completion handler does not handle empty return
values). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.24r2=1.110.2.25ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.24 php-src/ext/soap/soap.c:1.110.2.25
--- php-src/ext/soap/soap.c:1.110.2.24 Wed Feb 2 05:34:21 2005
+++ php-src/ext/soap/soap.c Fri Feb 4 10:42:27 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.110.2.24 2005/02/02 10:34:21 dmitry Exp $ */
+/* $Id: soap.c,v 1.110.2.25 2005/02/04 15:42:27 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3161,13 +3161,12 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(ret), pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(ret), (void
**)data, pos) != FAILURE) {
- char *param_name;
+ char *param_name = NULL;
int param_name_len;
- long param_index;
+ long param_index = i;
zend_hash_get_current_key_ex(Z_ARRVAL_P(ret),
param_name, param_name_len, param_index, 0, pos);
parameter = get_param(function, param_name,
param_index, TRUE);
-
if (style == SOAP_RPC) {
param = serialize_parameter(parameter, *data,
i, param_name, use, method TSRMLS_CC);
} else {
@@ -3788,6 +3787,16 @@
if (param_name != NULL) {
if (zend_hash_find(ht, param_name, strlen(param_name), (void
**)tmp) != FAILURE) {
return *tmp;
+ } else {
+ HashPosition pos;
+
+ zend_hash_internal_pointer_reset_ex(ht, pos);
+ while (zend_hash_get_current_data_ex(ht, (void **)tmp,
pos) != FAILURE) {
+ if ((*tmp)-paramName strcmp(param_name,
(*tmp)-paramName) == 0) {
+ return *tmp;
+ }
+ zend_hash_move_forward_ex(ht, pos);
+ }
}
} else {
if (zend_hash_index_find(ht, index, (void **)tmp) != FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap soap.c
dmitry Fri Feb 4 10:42:47 2005 EDT
Modified files:
/php-src/ext/soap soap.c
Log:
Fixed bug #31832 (SOAP encoding problem with complex types in WSDL mode with
multiple parts)
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.136r2=1.137ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.136 php-src/ext/soap/soap.c:1.137
--- php-src/ext/soap/soap.c:1.136 Wed Feb 2 05:34:39 2005
+++ php-src/ext/soap/soap.c Fri Feb 4 10:42:46 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.136 2005/02/02 10:34:39 dmitry Exp $ */
+/* $Id: soap.c,v 1.137 2005/02/04 15:42:46 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3161,13 +3161,12 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(ret), pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(ret), (void
**)data, pos) != FAILURE) {
- char *param_name;
+ char *param_name = NULL;
int param_name_len;
- long param_index;
+ long param_index = i;
zend_hash_get_current_key_ex(Z_ARRVAL_P(ret),
param_name, param_name_len, param_index, 0, pos);
parameter = get_param(function, param_name,
param_index, TRUE);
-
if (style == SOAP_RPC) {
param = serialize_parameter(parameter, *data,
i, param_name, use, method TSRMLS_CC);
} else {
@@ -3788,6 +3787,16 @@
if (param_name != NULL) {
if (zend_hash_find(ht, param_name, strlen(param_name), (void
**)tmp) != FAILURE) {
return *tmp;
+ } else {
+ HashPosition pos;
+
+ zend_hash_internal_pointer_reset_ex(ht, pos);
+ while (zend_hash_get_current_data_ex(ht, (void **)tmp,
pos) != FAILURE) {
+ if ((*tmp)-paramName strcmp(param_name,
(*tmp)-paramName) == 0) {
+ return *tmp;
+ }
+ zend_hash_move_forward_ex(ht, pos);
+ }
}
} else {
if (zend_hash_index_find(ht, index, (void **)tmp) != FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/time bug13142.phpt
sniper Fri Feb 4 18:23:34 2005 EDT Modified files: /php-src/ext/standard/tests/timebug13142.phpt Log: fix test http://cvs.php.net/diff.php/php-src/ext/standard/tests/time/bug13142.phpt?r1=1.3r2=1.4ty=u Index: php-src/ext/standard/tests/time/bug13142.phpt diff -u php-src/ext/standard/tests/time/bug13142.phpt:1.3 php-src/ext/standard/tests/time/bug13142.phpt:1.4 --- php-src/ext/standard/tests/time/bug13142.phpt:1.3 Tue Sep 9 17:56:33 2003 +++ php-src/ext/standard/tests/time/bug13142.phpt Fri Feb 4 18:23:34 2005 @@ -16,5 +16,5 @@ echo date(r\n, strtotime(Sep 04 2001 16:39:45)); ? --EXPECT-- -Tue, 4 Sep 2001 16:39:45 -0400 -Tue, 4 Sep 2001 16:39:45 -0400 +Tue, 04 Sep 2001 16:39:45 -0400 +Tue, 04 Sep 2001 16:39:45 -0400 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/standard/tests/time bug13142.phpt
sniper Fri Feb 4 18:24:06 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/standard/tests/timebug13142.phpt Log: fix test http://cvs.php.net/diff.php/php-src/ext/standard/tests/time/bug13142.phpt?r1=1.3r2=1.3.2.1ty=u Index: php-src/ext/standard/tests/time/bug13142.phpt diff -u php-src/ext/standard/tests/time/bug13142.phpt:1.3 php-src/ext/standard/tests/time/bug13142.phpt:1.3.2.1 --- php-src/ext/standard/tests/time/bug13142.phpt:1.3 Tue Sep 9 17:56:33 2003 +++ php-src/ext/standard/tests/time/bug13142.phpt Fri Feb 4 18:24:06 2005 @@ -16,5 +16,5 @@ echo date(r\n, strtotime(Sep 04 2001 16:39:45)); ? --EXPECT-- -Tue, 4 Sep 2001 16:39:45 -0400 -Tue, 4 Sep 2001 16:39:45 -0400 +Tue, 04 Sep 2001 16:39:45 -0400 +Tue, 04 Sep 2001 16:39:45 -0400 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard/tests/time bug13142.phpt
sniper Fri Feb 4 18:24:22 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard/tests/timebug13142.phpt Log: fix test http://cvs.php.net/diff.php/php-src/ext/standard/tests/time/bug13142.phpt?r1=1.1.2.3r2=1.1.2.4ty=u Index: php-src/ext/standard/tests/time/bug13142.phpt diff -u php-src/ext/standard/tests/time/bug13142.phpt:1.1.2.3 php-src/ext/standard/tests/time/bug13142.phpt:1.1.2.4 --- php-src/ext/standard/tests/time/bug13142.phpt:1.1.2.3 Tue Sep 9 17:31:51 2003 +++ php-src/ext/standard/tests/time/bug13142.phpt Fri Feb 4 18:24:22 2005 @@ -16,5 +16,5 @@ echo date(r\n, strtotime(Sep 04 2001 16:39:45)); ? --EXPECT-- -Tue, 4 Sep 2001 16:39:45 -0400 -Tue, 4 Sep 2001 16:39:45 -0400 +Tue, 04 Sep 2001 16:39:45 -0400 +Tue, 04 Sep 2001 16:39:45 -0400 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
