[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Oct 8 01:34:06 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2125r2=1.2126ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2125 php-src/ChangeLog:1.2126 --- php-src/ChangeLog:1.2125Fri Oct 7 01:39:36 2005 +++ php-src/ChangeLog Sat Oct 8 01:34:05 2005 @@ -1,3 +1,47 @@ +2005-10-07 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + - BFN + +2005-10-07 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_operators.c: + Fixed memory leak + +2005-10-07 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + configure.in + main/php_version.h: + - Back to dev. + +* (PHP_4_4) + NEWS + configure.in + main/php_version.h: + - Go with PHP 4.4.1RC1. + +* (PHP_4_4) + Zend/zend_compile.c: + - Fixed uninitialized value problem when an empty file is included. + +* (PHP_5_1) + NEWS: + - MFH: Fixed bug #34771 (strtotime() fails with 1-12am/pm). + +2005-10-07 Marcus Boerger [EMAIL PROTECTED] + +* main/streams/memory.c: + - C vs. C++ fix + +2005-10-07 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + maybe this month.. + 2005-10-06 Marcus Boerger [EMAIL PROTECTED] * (PHP_5_1) @@ -13281,7 +13325,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2125 2005/10/07 05:39:36 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2126 2005/10/08 05:34:05 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -16682,7 +16726,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2125 2005/10/07 05:39:36 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2126 2005/10/08 05:34:05 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -17163,7 +17207,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2125 2005/10/07 05:39:36 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2126 2005/10/08 05:34:05 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -18637,7 +18681,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2125 2005/10/07 05:39:36 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2126 2005/10/08 05:34:05 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
sniper Fri Oct 7 02:43:24 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: maybe this month.. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.96r2=1.2027.2.97ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.96 php-src/NEWS:1.2027.2.97 --- php-src/NEWS:1.2027.2.96Thu Oct 6 17:00:54 2005 +++ php-src/NEWSFri Oct 7 02:43:22 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? Aug 2005, PHP 5.1 Release Candidate 2 +?? Oct 2005, PHP 5.1 Release Candidate 2 - Changed SQLite extension to be a shared module in Windows distribution. (Edin) - Changed instanceof and catch operators, is_a() and is_subclass_of() -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams memory.c
helly Fri Oct 7 03:37:38 2005 EDT
Modified files:
/php-src/main/streams memory.c
Log:
- C vs. C++ fix
# I do too much C++ and too much languages anyway, right now actively:
# C, C++, Java, PHP, Peral
http://cvs.php.net/diff.php/php-src/main/streams/memory.c?r1=1.9r2=1.10ty=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.9 php-src/main/streams/memory.c:1.10
--- php-src/main/streams/memory.c:1.9 Thu Oct 6 17:30:56 2005
+++ php-src/main/streams/memory.c Fri Oct 7 03:37:37 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.9 2005/10/06 21:30:56 helly Exp $ */
+/* $Id: memory.c,v 1.10 2005/10/07 07:37:37 helly Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -308,12 +308,13 @@
static size_t php_stream_temp_read(php_stream *stream, char *buf, size_t count
TSRMLS_DC)
{
php_stream_temp_data *ts;
+ size_t got;
assert(stream != NULL);
ts = stream-abstract;
assert(ts != NULL);
- size_t got = php_stream_read(ts-innerstream, buf, count);
+ got = php_stream_read(ts-innerstream, buf, count);
if (!got) {
stream-eof |= ts-innerstream-eof;
--
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) /main/streams memory.c
helly Fri Oct 7 03:38:59 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/main/streams memory.c
Log:
- MFH C vs. C++ fix
http://cvs.php.net/diff.php/php-src/main/streams/memory.c?r1=1.8.2.1r2=1.8.2.2ty=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.8.2.1
php-src/main/streams/memory.c:1.8.2.2
--- php-src/main/streams/memory.c:1.8.2.1 Thu Oct 6 17:31:25 2005
+++ php-src/main/streams/memory.c Fri Oct 7 03:38:59 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.8.2.1 2005/10/06 21:31:25 helly Exp $ */
+/* $Id: memory.c,v 1.8.2.2 2005/10/07 07:38:59 helly Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -308,12 +308,13 @@
static size_t php_stream_temp_read(php_stream *stream, char *buf, size_t count
TSRMLS_DC)
{
php_stream_temp_data *ts;
+ size_t got;
assert(stream != NULL);
ts = stream-abstract;
assert(ts != NULL);
- size_t got = php_stream_read(ts-innerstream, buf, count);
+ got = php_stream_read(ts-innerstream, buf, count);
if (!got) {
stream-eof |= ts-innerstream-eof;
--
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) /main/streams memory.c
helly Fri Oct 7 03:39:45 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main/streams memory.c
Log:
- MFH C vs. C++ fix
http://cvs.php.net/diff.php/php-src/main/streams/memory.c?r1=1.6.2.1r2=1.6.2.2ty=u
Index: php-src/main/streams/memory.c
diff -u php-src/main/streams/memory.c:1.6.2.1
php-src/main/streams/memory.c:1.6.2.2
--- php-src/main/streams/memory.c:1.6.2.1 Thu Oct 6 17:31:15 2005
+++ php-src/main/streams/memory.c Fri Oct 7 03:39:45 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory.c,v 1.6.2.1 2005/10/06 21:31:15 helly Exp $ */
+/* $Id: memory.c,v 1.6.2.2 2005/10/07 07:39:45 helly Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -308,12 +308,13 @@
static size_t php_stream_temp_read(php_stream *stream, char *buf, size_t count
TSRMLS_DC)
{
php_stream_temp_data *ts;
+ size_t got;
assert(stream != NULL);
ts = stream-abstract;
assert(ts != NULL);
- size_t got = php_stream_read(ts-innerstream, buf, count);
+ got = php_stream_read(ts-innerstream, buf, count);
if (!got) {
stream-eof |= ts-innerstream-eof;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /main memory_streams.c
helly Fri Oct 7 03:40:55 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/main memory_streams.c
Log:
- MFH C vs. C++ fix
http://cvs.php.net/diff.php/php-src/main/memory_streams.c?r1=1.20.2.2.8.1r2=1.20.2.2.8.2ty=u
Index: php-src/main/memory_streams.c
diff -u php-src/main/memory_streams.c:1.20.2.2.8.1
php-src/main/memory_streams.c:1.20.2.2.8.2
--- php-src/main/memory_streams.c:1.20.2.2.8.1 Thu Oct 6 17:35:29 2005
+++ php-src/main/memory_streams.c Fri Oct 7 03:40:54 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: memory_streams.c,v 1.20.2.2.8.1 2005/10/06 21:35:29 helly Exp $ */
+/* $Id: memory_streams.c,v 1.20.2.2.8.2 2005/10/07 07:40:54 helly Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -308,12 +308,13 @@
static size_t php_stream_temp_read(php_stream *stream, char *buf, size_t count
TSRMLS_DC)
{
php_stream_temp_data *ts;
+ size_t got;
assert(stream != NULL);
ts = stream-abstract;
assert(ts != NULL);
- size_t got = php_stream_read(ts-innerstream, buf, count);
+ got = php_stream_read(ts-innerstream, buf, count);
if (!got) {
stream-eof |= ts-innerstream-eof;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/lib timezonemap.h
derick Fri Oct 7 03:57:46 2005 EDT
Modified files:
/php-src/ext/date/lib timezonemap.h
Log:
- Synced timezonemap with latest data.
http://cvs.php.net/diff.php/php-src/ext/date/lib/timezonemap.h?r1=1.2r2=1.3ty=u
Index: php-src/ext/date/lib/timezonemap.h
diff -u php-src/ext/date/lib/timezonemap.h:1.2
php-src/ext/date/lib/timezonemap.h:1.3
--- php-src/ext/date/lib/timezonemap.h:1.2 Sat Oct 1 11:07:20 2005
+++ php-src/ext/date/lib/timezonemap.h Fri Oct 7 03:57:43 2005
@@ -214,7 +214,6 @@
{ bdst, 1, 7200, Europe/Gibraltar },
{ bdst, 1, 7200, GB},
{ bdst, 1, 7200, GB-Eire },
- { bdst, 1, 7200, WET },
{ bdt, 1, -36000, America/Adak },
{ bdt, 1, -36000, America/Atka },
{ bdt, 1, -36000, America/Nome },
@@ -267,14 +266,12 @@
{ bst, 0, 3600, Europe/Belfast},
{ bst, 0, 3600, GB},
{ bst, 0, 3600, GB-Eire },
- { bst, 0, 3600, WET },
{ bst, 1, 3600, Eire },
{ bst, 1, 3600, Europe/Belfast},
{ bst, 1, 3600, Europe/Dublin },
{ bst, 1, 3600, Europe/Gibraltar },
{ bst, 1, 3600, GB},
{ bst, 1, 3600, GB-Eire },
- { bst, 1, 3600, WET },
{ btt, 0, 21600, Asia/Thimbu },
{ btt, 0, 21600, Asia/Thimphu },
{ burt, 0, 23400, Asia/Calcutta },
@@ -401,6 +398,7 @@
{ cest, 1, 7200, Libya },
{ cest, 1, 7200, Poland},
{ cest, 1, 7200, Portugal },
+ { cest, 1, 7200, WET },
{ cet, 0, 3600, Europe/Berlin },
{ cet, 0, 3600, Africa/Algiers},
{ cet, 0, 3600, Africa/Casablanca },
@@ -455,6 +453,7 @@
{ cet, 0, 3600, Libya },
{ cet, 0, 3600, Poland},
{ cet, 0, 3600, Portugal },
+ { cet, 0, 3600, WET },
{ cet, 0, 7200, Europe/Kaliningrad},
{ cgst, 1, -3600, America/Scoresbysund },
{ cgt, 0, -7200, America/Scoresbysund },
@@ -885,8 +884,8 @@
{ gmt, 0, 0, Europe/London },
{ gmt, 0, 0, GB},
{ gmt, 0, 0, GB-Eire },
+ { gmt, 0, 0, GMT },
{ gmt, 0, 0, Iceland },
- { gmt, 0, 0, WET },
{ gst, 0, 14400, Asia/Dubai},
{ gst, 0, 14400, Asia/Bahrain },
{ gst, 0, 14400, Asia/Muscat },
@@ -1118,6 +1117,7 @@
{ mpt, 1, -21600, Canada/East-Saskatchewan },
{ mpt, 1, -21600, Canada/Mountain },
{ mpt, 1, -21600, Canada/Saskatchewan },
+ { mpt, 1, -21600, MST },
{ mpt, 1, -21600, MST7MDT },
{ mpt, 1, -21600, Navajo},
{ mpt, 1, -21600, US/Mountain },
@@ -1519,6 +1519,7 @@
{ wemt, 1, 7200, Europe/Monaco },
{ wemt, 1, 7200, Europe/Paris },
{ wemt, 1, 7200, Portugal },
+ { wemt, 1, 7200, WET },
{ west, 1, 3600, Europe/Paris },
{ west, 1, 3600, Africa/Algiers},
{ west, 1, 3600, Africa/Casablanca },
@@ -1532,6 +1533,7 @@
{ west, 1, 3600, Europe/Madrid },
{ west, 1, 3600, Europe/Monaco },
{ west, 1, 3600, Portugal },
+ { west, 1, 3600, WET },
{ west, 1, 7200, Europe/Luxembourg },
{ wet, 0, 0, Europe/Paris },
{ wet, 0, 0, Africa/Algiers},
@@ -1548,6 +1550,7 @@
{ wet, 0, 0, Europe/Madrid },
{ wet, 0, 0, Europe/Monaco },
{ wet, 0, 0, Portugal },
+ { wet, 0, 0, WET },
{ wet, 0, 3600, Europe/Luxembourg },
{
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/date/lib timezonemap.h
derick Fri Oct 7 04:06:42 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/date/lib timezonemap.h
Log:
- MFH: New timezonemap data.
http://cvs.php.net/diff.php/php-src/ext/date/lib/timezonemap.h?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/date/lib/timezonemap.h
diff -u php-src/ext/date/lib/timezonemap.h:1.1.2.1
php-src/ext/date/lib/timezonemap.h:1.1.2.2
--- php-src/ext/date/lib/timezonemap.h:1.1.2.1 Sat Oct 1 11:04:07 2005
+++ php-src/ext/date/lib/timezonemap.h Fri Oct 7 04:06:40 2005
@@ -214,7 +214,6 @@
{ bdst, 1, 7200, Europe/Gibraltar },
{ bdst, 1, 7200, GB},
{ bdst, 1, 7200, GB-Eire },
- { bdst, 1, 7200, WET },
{ bdt, 1, -36000, America/Adak },
{ bdt, 1, -36000, America/Atka },
{ bdt, 1, -36000, America/Nome },
@@ -267,14 +266,12 @@
{ bst, 0, 3600, Europe/Belfast},
{ bst, 0, 3600, GB},
{ bst, 0, 3600, GB-Eire },
- { bst, 0, 3600, WET },
{ bst, 1, 3600, Eire },
{ bst, 1, 3600, Europe/Belfast},
{ bst, 1, 3600, Europe/Dublin },
{ bst, 1, 3600, Europe/Gibraltar },
{ bst, 1, 3600, GB},
{ bst, 1, 3600, GB-Eire },
- { bst, 1, 3600, WET },
{ btt, 0, 21600, Asia/Thimbu },
{ btt, 0, 21600, Asia/Thimphu },
{ burt, 0, 23400, Asia/Calcutta },
@@ -401,6 +398,7 @@
{ cest, 1, 7200, Libya },
{ cest, 1, 7200, Poland},
{ cest, 1, 7200, Portugal },
+ { cest, 1, 7200, WET },
{ cet, 0, 3600, Europe/Berlin },
{ cet, 0, 3600, Africa/Algiers},
{ cet, 0, 3600, Africa/Casablanca },
@@ -455,6 +453,7 @@
{ cet, 0, 3600, Libya },
{ cet, 0, 3600, Poland},
{ cet, 0, 3600, Portugal },
+ { cet, 0, 3600, WET },
{ cet, 0, 7200, Europe/Kaliningrad},
{ cgst, 1, -3600, America/Scoresbysund },
{ cgt, 0, -7200, America/Scoresbysund },
@@ -885,8 +884,8 @@
{ gmt, 0, 0, Europe/London },
{ gmt, 0, 0, GB},
{ gmt, 0, 0, GB-Eire },
+ { gmt, 0, 0, GMT },
{ gmt, 0, 0, Iceland },
- { gmt, 0, 0, WET },
{ gst, 0, 14400, Asia/Dubai},
{ gst, 0, 14400, Asia/Bahrain },
{ gst, 0, 14400, Asia/Muscat },
@@ -1118,6 +1117,7 @@
{ mpt, 1, -21600, Canada/East-Saskatchewan },
{ mpt, 1, -21600, Canada/Mountain },
{ mpt, 1, -21600, Canada/Saskatchewan },
+ { mpt, 1, -21600, MST },
{ mpt, 1, -21600, MST7MDT },
{ mpt, 1, -21600, Navajo},
{ mpt, 1, -21600, US/Mountain },
@@ -1519,6 +1519,7 @@
{ wemt, 1, 7200, Europe/Monaco },
{ wemt, 1, 7200, Europe/Paris },
{ wemt, 1, 7200, Portugal },
+ { wemt, 1, 7200, WET },
{ west, 1, 3600, Europe/Paris },
{ west, 1, 3600, Africa/Algiers},
{ west, 1, 3600, Africa/Casablanca },
@@ -1532,6 +1533,7 @@
{ west, 1, 3600, Europe/Madrid },
{ west, 1, 3600, Europe/Monaco },
{ west, 1, 3600, Portugal },
+ { west, 1, 3600, WET },
{ west, 1, 7200, Europe/Luxembourg },
{ wet, 0, 0, Europe/Paris },
{ wet, 0, 0, Africa/Algiers},
@@ -1548,6 +1550,7 @@
{ wet, 0, 0, Europe/Madrid },
{ wet, 0, 0, Europe/Monaco },
{ wet, 0, 0, Portugal },
+ { wet, 0, 0, WET },
{ wet, 0, 3600, Europe/Luxembourg
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c
dmitry Fri Oct 7 04:21:38 2005 EDT
Modified files:
/php-src/ext/soap php_encoding.c
Log:
Reverted last George patches
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.109r2=1.110ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.109
php-src/ext/soap/php_encoding.c:1.110
--- php-src/ext/soap/php_encoding.c:1.109 Fri Oct 7 01:14:31 2005
+++ php-src/ext/soap/php_encoding.c Fri Oct 7 04:21:37 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.109 2005/10/07 05:14:31 gschlossnagle Exp $ */
+/* $Id: php_encoding.c,v 1.110 2005/10/07 08:21:37 dmitry Exp $ */
#include time.h
@@ -319,10 +319,6 @@
node = encode-to_xml_after(encode-details, node,
style);
}
}
- if(!node) {
- node = xmlNewNode(NULL,BOGUS);
- xmlAddChild(parent, node);
- }
return node;
}
@@ -1189,7 +1185,6 @@
enc = sdlType-encode;
while (enc enc-details.sdl_type
- enc-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind != XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
@@ -1212,7 +1207,6 @@
sdlType-encode
type != sdlType-encode-details) {
if (sdlType-encode-details.sdl_type
- sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
@@ -1542,7 +1536,6 @@
enc = sdlType-encode;
while (enc enc-details.sdl_type
- enc-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind != XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
@@ -1552,8 +1545,11 @@
zval *tmp = get_zval_property(data, _
TSRMLS_CC);
if (tmp) {
xmlParam = master_to_xml(enc, tmp,
style, parent);
- } else {
+ } else if (prop == NULL) {
xmlParam = master_to_xml(enc, data,
style, parent);
+ } else {
+ xmlParam = xmlNewNode(NULL,BOGUS);
+ xmlAddChild(parent, xmlParam);
}
} else {
xmlParam = xmlNewNode(NULL,BOGUS);
@@ -1562,7 +1558,6 @@
} else if (sdlType-kind == XSD_TYPEKIND_EXTENSION
sdlType-encode type !=
sdlType-encode-details) {
if (sdlType-encode-details.sdl_type
- sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
@@ -1572,9 +1567,12 @@
if (tmp) {
xmlParam =
master_to_xml(sdlType-encode, tmp, style, parent);
- } else {
+ } else if (prop == NULL) {
xmlParam =
master_to_xml(sdlType-encode, data, style, parent);
- }
+ } else {
+ xmlParam = xmlNewNode(NULL,BOGUS);
+ xmlAddChild(parent, xmlParam);
+ }
}
} else {
xmlParam = xmlNewNode(NULL,BOGUS);
--
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) /ext/soap php_encoding.c
dmitry Fri Oct 7 04:23:36 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/soap php_encoding.c
Log:
Reverted last George patches
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.103.2.5r2=1.103.2.6ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.5
php-src/ext/soap/php_encoding.c:1.103.2.6
--- php-src/ext/soap/php_encoding.c:1.103.2.5 Fri Oct 7 01:14:52 2005
+++ php-src/ext/soap/php_encoding.c Fri Oct 7 04:23:35 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.5 2005/10/07 05:14:52 gschlossnagle Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.6 2005/10/07 08:23:35 dmitry Exp $ */
#include time.h
@@ -319,10 +319,6 @@
node = encode-to_xml_after(encode-details, node,
style);
}
}
- if(!node) {
- node = xmlNewNode(NULL,BOGUS);
- xmlAddChild(parent, node);
- }
return node;
}
@@ -1185,9 +1181,9 @@
if (sdlType-kind == XSD_TYPEKIND_RESTRICTION
sdlType-encode type != sdlType-encode-details) {
encodePtr enc;
+
enc = sdlType-encode;
while (enc enc-details.sdl_type
- enc-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind != XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
@@ -1210,7 +1206,6 @@
sdlType-encode
type != sdlType-encode-details) {
if (sdlType-encode-details.sdl_type
- sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
@@ -1517,6 +1512,7 @@
int i;
sdlTypePtr sdlType = type-sdl_type;
TSRMLS_FETCH();
+
if (!data || Z_TYPE_P(data) == IS_NULL) {
xmlParam = xmlNewNode(NULL,BOGUS);
xmlAddChild(parent, xmlParam);
@@ -1539,7 +1535,6 @@
enc = sdlType-encode;
while (enc enc-details.sdl_type
- enc-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind != XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
@@ -1549,9 +1544,12 @@
zval *tmp = get_zval_property(data, _
TSRMLS_CC);
if (tmp) {
xmlParam = master_to_xml(enc, tmp,
style, parent);
- } else {
+ } else if (prop == NULL) {
xmlParam = master_to_xml(enc, data,
style, parent);
- }
+ } else {
+ xmlParam = xmlNewNode(NULL,BOGUS);
+ xmlAddChild(parent, xmlParam);
+ }
} else {
xmlParam = xmlNewNode(NULL,BOGUS);
xmlAddChild(parent, xmlParam);
@@ -1559,7 +1557,6 @@
} else if (sdlType-kind == XSD_TYPEKIND_EXTENSION
sdlType-encode type !=
sdlType-encode-details) {
if (sdlType-encode-details.sdl_type
- sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) {
@@ -1569,8 +1566,11 @@
if (tmp) {
xmlParam =
master_to_xml(sdlType-encode, tmp, style, parent);
- } else {
+ } else if (prop == NULL) {
xmlParam =
master_to_xml(sdlType-encode, data, style, parent);
+ } else {
+ xmlParam = xmlNewNode(NULL,BOGUS);
+
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Fri Oct 7 04:55:36 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS configure.in /php-src/main php_version.h Log: - Go with PHP 4.4.1RC1. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.49r2=1.1247.2.920.2.50ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.49 php-src/NEWS:1.1247.2.920.2.50 --- php-src/NEWS:1.1247.2.920.2.49 Thu Oct 6 16:44:56 2005 +++ php-src/NEWSFri Oct 7 04:55:31 2005 @@ -1,6 +1,6 @@ PHP 4 NEWS ||| -?? ??? 2005, Version 4.4.1 +07 Oct 2005, Version 4.4.1RC1 - Added missing safe_mode checks for image* functions and cURL. (Ilia) - Added missing safe_mode/open_basedir checks for file uploads. (Ilia) - Fixed possible INI setting leak via virtual() in Apache 2 sapi. (Ilia) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.164.2.10r2=1.396.2.164.2.11ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.10 php-src/configure.in:1.396.2.164.2.11 --- php-src/configure.in:1.396.2.164.2.10 Wed Jul 27 07:53:54 2005 +++ php-src/configure.inFri Oct 7 04:55:32 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.10 2005/07/27 11:53:54 hyanantha Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.11 2005/10/07 08:55:32 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=1 -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/diff.php/php-src/main/php_version.h?r1=1.66.2.81.2.7r2=1.66.2.81.2.8ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.7 php-src/main/php_version.h:1.66.2.81.2.8 --- php-src/main/php_version.h:1.66.2.81.2.7Mon Jul 11 04:09:51 2005 +++ php-src/main/php_version.h Fri Oct 7 04:55:35 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 4.4.1-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 4.4.1RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src /ext/soap php_encoding.c
Hi George,
Seems you patch is wrong.
It breaks ext/soap/tests/schema/shema047.phpt and
ext/soap/tests/schema/049.phpt.
I reverted the path.
Please provide test case, what is not working for you?
Thanks. Dmitry.
-Original Message-
From: George Schlossnagle [mailto:[EMAIL PROTECTED]
Sent: Friday, October 07, 2005 2:30 AM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src /ext/soap php_encoding.c
gschlossnagle Thu Oct 6 18:30:11 2005 EDT
Modified files:
/php-src/ext/soap php_encoding.c
Log:
support complex types in restrictions and extensions
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1
=1.107r2=1.108ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.107
php-src/ext/soap/php_encoding.c:1.108
--- php-src/ext/soap/php_encoding.c:1.107 Thu Sep 29 06:00:59 2005
+++ php-src/ext/soap/php_encoding.c Thu Oct 6 18:30:08 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED]
|
+-
-+
*/
-/* $Id: php_encoding.c,v 1.107 2005/09/29 10:00:59 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.108 2005/10/06 22:30:08
gschlossnagle Exp $
+*/
#include time.h
@@ -319,6 +319,10 @@
node =
encode-to_xml_after(encode-details, node, style);
}
}
+ if(!node) {
+ node = xmlNewNode(NULL,BOGUS);
+ xmlAddChild(parent, node);
+ }
return node;
}
@@ -1536,6 +1540,7 @@
enc = sdlType-encode;
while (enc enc-details.sdl_type
+enc-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) { @@ -1545,11 +1550,8 @@
zval *tmp =
get_zval_property(data, _ TSRMLS_CC);
if (tmp) {
xmlParam =
master_to_xml(enc, tmp, style, parent);
- } else if (prop == NULL) {
- xmlParam =
master_to_xml(enc, data, style, parent);
} else {
- xmlParam =
xmlNewNode(NULL,BOGUS);
- xmlAddChild(parent, xmlParam);
+ xmlParam =
master_to_xml(enc, data, style, parent);
}
} else {
xmlParam = xmlNewNode(NULL,BOGUS);
@@ -1558,6 +1560,7 @@
} else if (sdlType-kind == XSD_TYPEKIND_EXTENSION
sdlType-encode type !=
sdlType-encode-details) {
if (sdlType-encode-details.sdl_type
+
sdlType-encode-details.sdl_type-kind != XSD_TYPEKIND_COMPLEX
+
sdlType-encode-details.sdl_type-kind != XSD_TYPEKIND_SIMPLE
sdlType-encode-details.sdl_type-kind != XSD_TYPEKIND_LIST
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) { @@ -1567,12 +1570,9 @@
if (tmp) {
xmlParam =
master_to_xml(sdlType-encode, tmp, style, parent);
- } else if (prop == NULL) {
- xmlParam =
master_to_xml(sdlType-encode, data, style, parent);
} else {
- xmlParam =
xmlNewNode(NULL,BOGUS);
- xmlAddChild(parent, xmlParam);
- }
+ xmlParam =
master_to_xml(sdlType-encode, data, style, parent);
+ }
}
} else {
xmlParam = xmlNewNode(NULL,BOGUS);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Fri Oct 7 05:32:06 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS configure.in /php-src/main php_version.h Log: - Back to dev. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.50r2=1.1247.2.920.2.51ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.50 php-src/NEWS:1.1247.2.920.2.51 --- php-src/NEWS:1.1247.2.920.2.50 Fri Oct 7 04:55:31 2005 +++ php-src/NEWSFri Oct 7 05:32:02 2005 @@ -1,5 +1,8 @@ PHP 4 NEWS ||| +?? Oct 2005, Version 4.4.1 + + 07 Oct 2005, Version 4.4.1RC1 - Added missing safe_mode checks for image* functions and cURL. (Ilia) - Added missing safe_mode/open_basedir checks for file uploads. (Ilia) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.164.2.11r2=1.396.2.164.2.12ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.11 php-src/configure.in:1.396.2.164.2.12 --- php-src/configure.in:1.396.2.164.2.11 Fri Oct 7 04:55:32 2005 +++ php-src/configure.inFri Oct 7 05:32:03 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.11 2005/10/07 08:55:32 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.12 2005/10/07 09:32:03 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=1 -EXTRA_VERSION=RC1 +EXTRA_VERSION=RC2-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/diff.php/php-src/main/php_version.h?r1=1.66.2.81.2.8r2=1.66.2.81.2.9ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.8 php-src/main/php_version.h:1.66.2.81.2.9 --- php-src/main/php_version.h:1.66.2.81.2.8Fri Oct 7 04:55:35 2005 +++ php-src/main/php_version.h Fri Oct 7 05:32:06 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 1 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 4.4.1RC1 +#define PHP_EXTRA_VERSION RC2-dev +#define PHP_VERSION 4.4.1RC2-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_http.c
dmitry Fri Oct 7 07:55:53 2005 EDT
Modified files:
/php-src/ext/soap php_http.c
Log:
Fixed bug #34766 (possible crash on HTTP redirection)
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.78r2=1.79ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.78 php-src/ext/soap/php_http.c:1.79
--- php-src/ext/soap/php_http.c:1.78Fri Sep 16 11:47:42 2005
+++ php-src/ext/soap/php_http.c Fri Oct 7 07:55:53 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.78 2005/09/16 15:47:42 dmitry Exp $ */
+/* $Id: php_http.c,v 1.79 2005/10/07 11:55:53 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -836,6 +836,7 @@
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr), httpsocket,
sizeof(httpsocket));
zend_hash_del(Z_OBJPROP_P(this_ptr), _use_proxy,
sizeof(_use_proxy));
+ stream = NULL;
}
/* Process HTTP status codes */
@@ -848,13 +849,6 @@
int body_size;
if (new_url != NULL) {
- if (get_http_body(stream, !http_1_1,
http_headers, body, body_size TSRMLS_CC)) {
- efree(body);
- } else {
- php_stream_close(stream);
- zend_hash_del(Z_OBJPROP_P(this_ptr),
httpsocket, sizeof(httpsocket));
- stream = NULL;
- }
efree(http_headers);
efree(http_body);
efree(loc);
--
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) /ext/soap php_http.c
dmitry Fri Oct 7 07:56:19 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/soap php_http.c
Log:
Fixed bug #34766 (possible crash on HTTP redirection)
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.77.2.1r2=1.77.2.2ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.1
php-src/ext/soap/php_http.c:1.77.2.2
--- php-src/ext/soap/php_http.c:1.77.2.1Fri Sep 16 11:48:30 2005
+++ php-src/ext/soap/php_http.c Fri Oct 7 07:56:19 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.77.2.1 2005/09/16 15:48:30 dmitry Exp $ */
+/* $Id: php_http.c,v 1.77.2.2 2005/10/07 11:56:19 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -836,6 +836,7 @@
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr), httpsocket,
sizeof(httpsocket));
zend_hash_del(Z_OBJPROP_P(this_ptr), _use_proxy,
sizeof(_use_proxy));
+ stream = NULL;
}
/* Process HTTP status codes */
@@ -848,13 +849,6 @@
int body_size;
if (new_url != NULL) {
- if (get_http_body(stream, !http_1_1,
http_headers, body, body_size TSRMLS_CC)) {
- efree(body);
- } else {
- php_stream_close(stream);
- zend_hash_del(Z_OBJPROP_P(this_ptr),
httpsocket, sizeof(httpsocket));
- stream = NULL;
- }
efree(http_headers);
efree(http_body);
efree(loc);
--
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/soap php_http.c
dmitry Fri Oct 7 07:56:40 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/soap php_http.c
Log:
Fixed bug #34766 (possible crash on HTTP redirection)
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.55.2.20r2=1.55.2.21ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.55.2.20
php-src/ext/soap/php_http.c:1.55.2.21
--- php-src/ext/soap/php_http.c:1.55.2.20 Fri Sep 16 11:48:51 2005
+++ php-src/ext/soap/php_http.c Fri Oct 7 07:56:40 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.55.2.20 2005/09/16 15:48:51 dmitry Exp $ */
+/* $Id: php_http.c,v 1.55.2.21 2005/10/07 11:56:40 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -861,6 +861,7 @@
php_stream_close(stream);
zend_hash_del(Z_OBJPROP_P(this_ptr), httpsocket,
sizeof(httpsocket));
zend_hash_del(Z_OBJPROP_P(this_ptr), _use_proxy,
sizeof(_use_proxy));
+ stream = NULL;
}
/* Process HTTP status codes */
@@ -873,13 +874,6 @@
int body_size;
if (new_url != NULL) {
- if (get_http_body(stream, !http_1_1,
http_headers, body, body_size TSRMLS_CC)) {
- efree(body);
- } else {
- php_stream_close(stream);
- zend_hash_del(Z_OBJPROP_P(this_ptr),
httpsocket, sizeof(httpsocket));
- stream = NULL;
- }
efree(http_headers);
efree(http_body);
efree(loc);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlreader php_xmlreader.c
rrichards Fri Oct 7 09:26:12 2005 EDT
Modified files:
/php-src/ext/xmlreader php_xmlreader.c
Log:
maintain BC for PECL
http://cvs.php.net/diff.php/php-src/ext/xmlreader/php_xmlreader.c?r1=1.15r2=1.16ty=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.15
php-src/ext/xmlreader/php_xmlreader.c:1.16
--- php-src/ext/xmlreader/php_xmlreader.c:1.15 Wed Oct 5 15:52:58 2005
+++ php-src/ext/xmlreader/php_xmlreader.c Fri Oct 7 09:26:11 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_xmlreader.c,v 1.15 2005/10/05 19:52:58 rrichards Exp $ */
+/* $Id: php_xmlreader.c,v 1.16 2005/10/07 13:26:11 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -276,16 +276,22 @@
}
#endif
+#if ZEND_EXTENSION_API_NO = 220050617
static zend_module_dep xmlreader_deps[] = {
ZEND_MOD_REQUIRED(libxml)
{NULL, NULL, NULL}
};
+#endif
/* {{{ xmlreader_module_entry
*/
zend_module_entry xmlreader_module_entry = {
+#if ZEND_EXTENSION_API_NO = 220050617
STANDARD_MODULE_HEADER_EX, NULL,
xmlreader_deps,
+#else
+ STANDARD_MODULE_HEADER,
+#endif
xmlreader,
NULL,
PHP_MINIT(xmlreader),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
derick Fri Oct 7 09:33:13 2005 EDT
Modified files:
/php-src/ext/date php_date.c
Log:
- Change parameter name because NetWare expands tzname as a macro to
something else.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.58r2=1.59ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.58 php-src/ext/date/php_date.c:1.59
--- php-src/ext/date/php_date.c:1.58Wed Oct 5 14:38:30 2005
+++ php-src/ext/date/php_date.c Fri Oct 7 09:33:13 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.58 2005/10/05 18:38:30 derick Exp $ */
+/* $Id: php_date.c,v 1.59 2005/10/07 13:33:13 derick Exp $ */
#include php.h
#include php_streams.h
@@ -280,16 +280,16 @@
/* }}} */
/* {{{ Timezone Cache functions */
-static timelib_tzinfo *php_date_parse_tzfile(char *tzname, timelib_tzdb *tzdb
TSRMLS_DC)
+static timelib_tzinfo *php_date_parse_tzfile(char *formal_tzname, timelib_tzdb
*tzdb TSRMLS_DC)
{
timelib_tzinfo *tzi, **ptzi;
- if (zend_hash_find(DATEG(tzcache), tzname, strlen(tzname) + 1, (void
**) ptzi) == SUCCESS) {
+ if (zend_hash_find(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void **) ptzi) == SUCCESS) {
return *ptzi;
}
- tzi = timelib_parse_tzfile(tzname, tzdb);
- zend_hash_add(DATEG(tzcache), tzname, strlen(tzname) + 1, (void *)
tzi, sizeof(timelib_tzinfo*), NULL);
+ tzi = timelib_parse_tzfile(formal_tzname, tzdb);
+ zend_hash_add(DATEG(tzcache), formal_tzname, strlen(formal_tzname) +
1, (void *) tzi, sizeof(timelib_tzinfo*), NULL);
return tzi;
}
/* }}} */
--
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) /ext/date php_date.c
derick Fri Oct 7 09:33:31 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/date php_date.c
Log:
- MFH: Change parameter name because NetWare expands tzname as a macro to
something else.
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.12r2=1.43.2.13ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.12
php-src/ext/date/php_date.c:1.43.2.13
--- php-src/ext/date/php_date.c:1.43.2.12 Wed Oct 5 07:06:56 2005
+++ php-src/ext/date/php_date.c Fri Oct 7 09:33:31 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.12 2005/10/05 11:06:56 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.13 2005/10/07 13:33:31 derick Exp $ */
#include php.h
#include php_streams.h
@@ -278,16 +278,16 @@
/* }}} */
/* {{{ Timezone Cache functions */
-static timelib_tzinfo *php_date_parse_tzfile(char *tzname, timelib_tzdb *tzdb
TSRMLS_DC)
+static timelib_tzinfo *php_date_parse_tzfile(char *formal_tzname, timelib_tzdb
*tzdb TSRMLS_DC)
{
timelib_tzinfo *tzi, **ptzi;
- if (zend_hash_find(DATEG(tzcache), tzname, strlen(tzname) + 1, (void
**) ptzi) == SUCCESS) {
+ if (zend_hash_find(DATEG(tzcache), formal_tzname,
strlen(formal_tzname) + 1, (void **) ptzi) == SUCCESS) {
return *ptzi;
}
- tzi = timelib_parse_tzfile(tzname, tzdb);
- zend_hash_add(DATEG(tzcache), tzname, strlen(tzname) + 1, (void *)
tzi, sizeof(timelib_tzinfo*), NULL);
+ tzi = timelib_parse_tzfile(formal_tzname, tzdb);
+ zend_hash_add(DATEG(tzcache), formal_tzname, strlen(formal_tzname) +
1, (void *) tzi, sizeof(timelib_tzinfo*), NULL);
return tzi;
}
/* }}} */
--
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) /ext/soap/tests/schema schema081.phpt
gschlossnagle Fri Oct 7 11:05:07 2005 EDT Added files: (Branch: PHP_5_1) /php-src/ext/soap/tests/schema schema081.phpt Log: Test simple derivation from restriction. http://cvs.php.net/co.php/php-src/ext/soap/tests/schema/schema081.phpt?r=1.1p=1 Index: php-src/ext/soap/tests/schema/schema081.phpt +++ php-src/ext/soap/tests/schema/schema081.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap/tests/schema schema081.phpt
gschlossnagle Fri Oct 7 11:06:09 2005 EDT
Modified files:
/php-src/ext/soap/tests/schema schema081.phpt
Log:
Test simple derivation via restriction
http://cvs.php.net/diff.php/php-src/ext/soap/tests/schema/schema081.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/soap/tests/schema/schema081.phpt
diff -u /dev/null php-src/ext/soap/tests/schema/schema081.phpt:1.2
--- /dev/null Fri Oct 7 11:06:09 2005
+++ php-src/ext/soap/tests/schema/schema081.phptFri Oct 7 11:06:09 2005
@@ -0,0 +1,30 @@
+--TEST--
+SOAP XML Schema 81: Deriviation by restriction from acomplex type
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+include test_schema.inc;
+$schema = EOF
+ complexType name=testType2
+ sequence
+ element name=int type=int/
+ /sequence
+ /complexType
+ complexType name=testType
+ complexContent
+ restriction base=tns:testType2/
+ /complexContent
+ /complexType
+EOF;
+test_schema($schema,'type=tns:testType',(object)array(int=123.5));
+echo ok;
+?
+--EXPECTF--
+?xml version=1.0?
+SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://test-uri/; xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:testtestParam
xsi:type=ns1:testTypeint
xsi:type=xsd:int123/int/testParam/ns1:test/SOAP-ENV:Body/SOAP-ENV:Envelope
+object(stdClass)#%d (2) {
+ [int]=
+ int(123)
+}
+ok
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/soap php_encoding.c
Test 49 looks totally incorrect to me. You've derived the object by
restriction in accordance with section 2.5.2.1 of the Schema Part 2
spec,
[Definition:] A datatype is said to be ·derived· by restriction from
another datatype when values for zero or more ·constraining facet·s
are specified that serve to constrain its ·value space· and/or its
lexical space to a subset of the base type.
Check http://www.w3.org/TR/xmlschema-2/#derivation-by-restriction and
http://www.w3.org/TR/xmlschema-1/#Complex_Type_Definition_details for
more details.
but you aren't constraining the type to be a subset of the base type,
in fact you ignore the base type completely and just implement your
own parameter there, which seems to violate the way restrictions work.
Test 49 _should_ look like this:
Further, if you specify no constraints on a restriction, then you
extend off that restriction. I've added test 81 which validates this
(and fails with your reversion of my patch).
Here's a patch that makes 81 pass correctly and leaves 47 working.
As I've stated, 49 just looks wrong:
George
On Oct 7, 2005, at 5:03 AM, Dmitry Stogov wrote:
Hi George,
Seems you patch is wrong.
It breaks ext/soap/tests/schema/shema047.phpt and
ext/soap/tests/schema/049.phpt.
I reverted the path.
Please provide test case, what is not working for you?
Thanks. Dmitry.
-Original Message-
From: George Schlossnagle [mailto:[EMAIL PROTECTED]
Sent: Friday, October 07, 2005 2:30 AM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src /ext/soap php_encoding.c
gschlossnagleThu Oct 6 18:30:11 2005 EDT
Modified files:
/php-src/ext/soapphp_encoding.c
Log:
support complex types in restrictions and extensions
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1
=1.107r2=1.108ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.107
php-src/ext/soap/php_encoding.c:1.108
--- php-src/ext/soap/php_encoding.c:1.107Thu Sep 29 06:00:59 2005
+++ php-src/ext/soap/php_encoding.cThu Oct 6 18:30:08 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED]
|
+-
-+
*/
-/* $Id: php_encoding.c,v 1.107 2005/09/29 10:00:59 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.108 2005/10/06 22:30:08
gschlossnagle Exp $
+*/
#include time.h
@@ -319,6 +319,10 @@
node =
encode-to_xml_after(encode-details, node, style);
}
}
+if(!node) {
+node = xmlNewNode(NULL,BOGUS);
+xmlAddChild(parent, node);
+}
return node;
}
@@ -1536,6 +1540,7 @@
enc = sdlType-encode;
while (enc enc-details.sdl_type
+ enc-details.sdl_type-kind !=
XSD_TYPEKIND_COMPLEX
enc-details.sdl_type-kind !=
XSD_TYPEKIND_SIMPLE
enc-details.sdl_type-kind !=
XSD_TYPEKIND_LIST
enc-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) { @@ -1545,11 +1550,8 @@
zval *tmp =
get_zval_property(data, _ TSRMLS_CC);
if (tmp) {
xmlParam =
master_to_xml(enc, tmp, style, parent);
-} else if (prop == NULL) {
-xmlParam =
master_to_xml(enc, data, style, parent);
} else {
-xmlParam =
xmlNewNode(NULL,BOGUS);
-xmlAddChild(parent, xmlParam);
+xmlParam =
master_to_xml(enc, data, style, parent);
}
} else {
xmlParam = xmlNewNode(NULL,BOGUS);
@@ -1558,6 +1560,7 @@
} else if (sdlType-kind == XSD_TYPEKIND_EXTENSION
sdlType-encode type !=
sdlType-encode-details) {
if (sdlType-encode-details.sdl_type
+
sdlType-encode-details.sdl_type-kind != XSD_TYPEKIND_COMPLEX
+
sdlType-encode-details.sdl_type-kind != XSD_TYPEKIND_SIMPLE
sdlType-encode-details.sdl_type-kind != XSD_TYPEKIND_LIST
sdlType-encode-details.sdl_type-kind !=
XSD_TYPEKIND_UNION) { @@ -1567,12 +1570,9 @@
if (tmp) {
xmlParam =
master_to_xml(sdlType-encode, tmp, style, parent);
-} else if (prop == NULL) {
-xmlParam =
master_to_xml(sdlType-encode, data, style, parent);
} else {
-xmlParam =
xmlNewNode(NULL,BOGUS);
-xmlAddChild(parent, xmlParam);
-}
+xmlParam =
master_to_xml(sdlType-encode, data, style, parent);
+}
}
} else {
xmlParam = xmlNewNode(NULL,BOGUS);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
George Schlossnagle
-- Vice President of Engineering
-- OmniTI Computer Consulting
-- http://www.omniti.com
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit:
[PHP-CVS] cvs: CVSROOT / avail
gobaFri Oct 7 12:01:19 2005 EDT Modified files: /CVSROOTavail Log: give phpdoc karma to grantc, as he is going to document the new ingres stuff http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1033r2=1.1034ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1033 CVSROOT/avail:1.1034 --- CVSROOT/avail:1.1033Tue Oct 4 15:15:04 2005 +++ CVSROOT/avail Fri Oct 7 12:01:17 2005 @@ -36,7 +36,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief977,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodive,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,tix,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhitama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca
Re: [PHP-CVS] cvs: php-src /ext/xmlreader php_xmlreader.c
Don't want to branch this any more than necessary. Rob Jani Taskinen wrote: Eh, you know about these things called 'branches' in CVS? :) --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Fri Oct 7 14:51:18 2005 EDT Modified files: /CVSROOTavail Log: - Give traufeisen karma to his pecl extension. http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1034r2=1.1035ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1034 CVSROOT/avail:1.1035 --- CVSROOT/avail:1.1034Fri Oct 7 12:01:17 2005 +++ CVSROOT/avail Fri Oct 7 14:51:11 2005 @@ -293,6 +293,7 @@ avail|jeichorn|pear/HTML_AJAX,pear/PhpDocumentor avail|mike|pecl/win32ps avail|clockwerx|pear/Validate +avail|traufeisen|pecl/gnupg # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- 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 Fri Oct 7 14:57:11 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.98r2=1.2027.2.99ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.98 php-src/NEWS:1.2027.2.99 --- php-src/NEWS:1.2027.2.98Fri Oct 7 04:08:55 2005 +++ php-src/NEWSFri Oct 7 14:57:10 2005 @@ -86,6 +86,7 @@ (Dmitry) - Fixed bug #34257 (lib64 not handled correctly in ming extension). (Marcus) - Fixed bug #34221 (Compiling xmlrpc as shared fails other parts). (Jani) +- Fixed bug #34216 (Segfault with autoload). (Marcus) - Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler). (Dmitry, Alex) - Fixed bug #34191 (ob_gzhandler does not enforce trailing \0). (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) /ext/date php_date.c
derick Wed Oct 5 07:06:57 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/date php_date.c Log: - Implement correct Windows timezone guessing. Thanks for you work, Derick! However after checking the correct TZ, you forgot to return it :) Something like the above will work: Index: php_date.c === RCS file: /repository/php-src/ext/date/php_date.c,v retrieving revision 1.59 diff -u -r1.59 php_date.c --- php_date.c 7 Oct 2005 13:33:13 - 1.59 +++ php_date.c 7 Oct 2005 19:43:54 - @@ -357,8 +357,8 @@ } php_error_docref(NULL TSRMLS_CC, E_STRICT, It is not safe to rely on the systems timezone settings, please use the date.timezone setting, the TZ environment variable or the date_default_timezone_set() function. We use '%s' for '%.1f/DST' instead., tzid, (float) ((tzi.Bias + tzi.DaylightBias) / -60)); break; - } + return tzid; } #endif /* Fallback to UTC */ Nuno -- 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) /ext/date php_date.c
derick Wed Oct 5 07:06:57 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/date php_date.c Log: - Implement correct Windows timezone guessing. Thanks for you work, Derick! However after checking the correct TZ, you forgot to return it :) Something like the above will work: Updated patch to cover all test cases @ http://mega.ist.utl.pt/~ncpl/php_date_win.txt Sorry for the noise, Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date php_date.c
derick Fri Oct 7 16:32:00 2005 EDT Modified files: /php-src/ext/date php_date.c Log: - Make the Windows guessing routines actually return the guessed timezone. http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.59r2=1.60ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.59 php-src/ext/date/php_date.c:1.60 --- php-src/ext/date/php_date.c:1.59Fri Oct 7 09:33:13 2005 +++ php-src/ext/date/php_date.c Fri Oct 7 16:31:57 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.59 2005/10/07 13:33:13 derick Exp $ */ +/* $Id: php_date.c,v 1.60 2005/10/07 20:31:57 derick Exp $ */ #include php.h #include php_streams.h @@ -340,6 +340,7 @@ case TIME_ZONE_ID_UNKNOWN: /* we have no clue what it is, return UTC */ php_error_docref(NULL TSRMLS_CC, E_STRICT, It is not safe to rely on the systems timezone settings, please use the date.timezone setting, the TZ environment variable or the date_default_timezone_set() function. We use 'UTC' instead.); + tzid = UTC; break; case TIME_ZONE_ID_STANDARD: @@ -357,8 +358,8 @@ } php_error_docref(NULL TSRMLS_CC, E_STRICT, It is not safe to rely on the systems timezone settings, please use the date.timezone setting, the TZ environment variable or the date_default_timezone_set() function. We use '%s' for '%.1f/DST' instead., tzid, (float) ((tzi.Bias + tzi.DaylightBias) / -60)); break; - } + return tzid; } #endif /* Fallback to UTC */ -- 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) /ext/date php_date.c
derick Fri Oct 7 16:32:18 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/date php_date.c Log: - MFH: Make the Windows guessing routines actually return the guessed timezone. http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.43.2.13r2=1.43.2.14ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.43.2.13 php-src/ext/date/php_date.c:1.43.2.14 --- php-src/ext/date/php_date.c:1.43.2.13 Fri Oct 7 09:33:31 2005 +++ php-src/ext/date/php_date.c Fri Oct 7 16:32:17 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: php_date.c,v 1.43.2.13 2005/10/07 13:33:31 derick Exp $ */ +/* $Id: php_date.c,v 1.43.2.14 2005/10/07 20:32:17 derick Exp $ */ #include php.h #include php_streams.h @@ -338,6 +338,7 @@ case TIME_ZONE_ID_UNKNOWN: /* we have no clue what it is, return UTC */ php_error_docref(NULL TSRMLS_CC, E_STRICT, It is not safe to rely on the systems timezone settings, please use the date.timezone setting, the TZ environment variable or the date_default_timezone_set() function. We use 'UTC' instead.); + tzid = UTC; break; case TIME_ZONE_ID_STANDARD: @@ -355,8 +356,8 @@ } php_error_docref(NULL TSRMLS_CC, E_STRICT, It is not safe to rely on the systems timezone settings, please use the date.timezone setting, the TZ environment variable or the date_default_timezone_set() function. We use '%s' for '%.1f/DST' instead., tzid, (float) ((tzi.Bias + tzi.DaylightBias) / -60)); break; - } + return tzid; } #endif /* Fallback to UTC */ -- 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) /ext/date php_date.c
On Fri, 7 Oct 2005, Nuno Lopes wrote: derick Wed Oct 5 07:06:57 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/date php_date.c Log: - Implement correct Windows timezone guessing. Thanks for you work, Derick! However after checking the correct TZ, you forgot to return it :) Something like the above will work: Updated patch to cover all test cases @ http://mega.ist.utl.pt/~ncpl/php_date_win.txt COmmitted with a minor change, please test. And thanks for the patch. Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/examples recursivetreeiterator.inc
helly Fri Oct 7 19:14:51 2005 EDT
Modified files:
/php-src/ext/spl/examples recursivetreeiterator.inc
Log:
- Prevent notices from showing up if inner's current() does not return a
string
http://cvs.php.net/diff.php/php-src/ext/spl/examples/recursivetreeiterator.inc?r1=1.3r2=1.4ty=u
Index: php-src/ext/spl/examples/recursivetreeiterator.inc
diff -u php-src/ext/spl/examples/recursivetreeiterator.inc:1.3
php-src/ext/spl/examples/recursivetreeiterator.inc:1.4
--- php-src/ext/spl/examples/recursivetreeiterator.inc:1.3 Wed Oct 5
15:10:22 2005
+++ php-src/ext/spl/examples/recursivetreeiterator.inc Fri Oct 7 19:14:49 2005
@@ -60,7 +60,7 @@
*/
function getEntry()
{
- return $this-callToString ? $this-__toString() :
parent::current();
+ return $this-callToString ? $this-__toString() :
@(string)parent::current();
}
/** @return string to place after the current element
--
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) /ext/pdo/tests pdo_031.phpt
helly Fri Oct 7 19:23:44 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/pdo/tests pdo_031.phpt
Log:
- MFH Add new test
http://cvs.php.net/co.php/php-src/ext/pdo/tests/pdo_031.phpt?r=1.1p=1
Index: php-src/ext/pdo/tests/pdo_031.phpt
+++ php-src/ext/pdo/tests/pdo_031.phpt
--TEST--
PDO Common: PDOStatement SPL iterator
--SKIPIF--
?php # vim:ft=php
if (!extension_loaded('pdo')) die('skip');
if (!extension_loaded('SPL')) print 'skip SPL not available';
$dir = getenv('REDIR_TEST_DIR');
if (false == $dir) die('skip no driver');
require_once $dir . 'pdo_test.inc';
if (!class_exists('RecursiveArrayIterator', false)) die('skip Class
RecursiveArrayIterator missing');
if (!class_exists('RecursiveTreeIterator', false)
!file_exists(getenv('REDIR_TEST_DIR').'../../spl/examples/recursivetreeiterator.inc'))
die('skip Class RecursiveTreeIterator missing');
PDOTest::skip();
?
--FILE--
?php
if (getenv('REDIR_TEST_DIR') === false)
putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
if (!class_exists('RecursiveTreeIterator', false))
require_once(getenv('REDIR_TEST_DIR').'../../spl/examples/recursivetreeiterator.inc');
$data = array(
array('10', 'Abc', 'zxy'),
array('20', 'Def', 'wvu'),
array('30', 'Ghi', 'tsr'),
);
$db = PDOTest::factory();
$db-exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2
VARCHAR(16))');
$stmt = $db-prepare(INSERT INTO test VALUES(?, ?, ?));
foreach ($data as $row) {
$stmt-execute($row);
}
unset($stmt);
echo ===QUERY===\n;
$stmt = $db-query('SELECT * FROM test');
foreach(new RecursiveTreeIterator(new
RecursiveArrayIterator($stmt-fetchAll(PDO::FETCH_ASSOC)),
RecursiveIteratorIterator::SELF_FIRST) as $c=$v)
{
echo $v [$c]\n;
}
echo ===DONE===\n;
exit(0);
?
--EXPECT--
===QUERY===
|-Array [0]
| |-10 [id]
| |-Abc [val]
| \-zxy [val2]
|-Array [1]
| |-20 [id]
| |-Def [val]
| \-wvu [val2]
\-Array [2]
|-30 [id]
|-Ghi [val]
\-tsr [val2]
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
