[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Wed Nov 23 01:51:44 2005 EDT
Modified files:
/ZendEngine2ChangeLog
Log:
ChangeLog update
http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.812r2=1.813ty=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.812 ZendEngine2/ChangeLog:1.813
--- ZendEngine2/ChangeLog:1.812 Tue Nov 22 01:48:55 2005
+++ ZendEngine2/ChangeLog Wed Nov 23 01:51:42 2005
@@ -1,3 +1,9 @@
+2005-11-22 Ilia Alshanetsky [EMAIL PROTECTED]
+
+* (PHP_5_1)
+ zend_compile.c:
+ Removed {} E_STRICT pending furher discussion, may be introduced later
on.
+
2005-11-21 Marcus Boerger [EMAIL PROTECTED]
* (PHP_5_1)
@@ -11136,7 +11142,7 @@
2003-06-10 Jani Taskinen [EMAIL PROTECTED]
* zend_multiply.h:
- - Missing $Id: ChangeLog,v 1.812 2005/11/22 06:48:55 changelog Exp $ tag
+ - Missing $Id: ChangeLog,v 1.813 2005/11/23 06:51:42 changelog Exp $ tag
2003-06-10 James Cox [EMAIL PROTECTED]
@@ -12860,7 +12866,7 @@
zend_types.h
zend_variables.c
zend_variables.h:
- - Added some missing CVS $Id: ChangeLog,v 1.812 2005/11/22 06:48:55
changelog Exp $ tags, headers and footers.
+ - Added some missing CVS $Id: ChangeLog,v 1.813 2005/11/23 06:51:42
changelog Exp $ tags, headers and footers.
2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: CVSROOT / avail
alan_k Tue Nov 22 05:25:35 2005 EDT Modified files: /CVSROOTavail Log: add bate to PEAR: Net_DNS and Net_IPv4 http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1047r2=1.1048ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1047 CVSROOT/avail:1.1048 --- CVSROOT/avail:1.1047Sat Nov 19 04:55:48 2005 +++ CVSROOT/avail Tue Nov 22 05:25:31 2005 @@ -299,6 +299,7 @@ avail|mike|pecl/win32ps avail|clockwerx|pear/Validate avail|traufeisen|pecl/gnupg,phpdoc/en/reference/gnupg +avail|bate|pear/Net_DNS,pear/Net_IPv4 avail|mikl|pecl/memcache -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
alan_k Tue Nov 22 05:27:01 2005 EDT Modified files: /CVSROOTavail Log: remove old ext/midgard privaliges for alan_k (never existed) http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1048r2=1.1049ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1048 CVSROOT/avail:1.1049 --- CVSROOT/avail:1.1048Tue Nov 22 05:25:31 2005 +++ CVSROOT/avail Tue Nov 22 05:27:01 2005 @@ -177,7 +177,6 @@ avail|yohgaki,fujimoto,dets|php-src/ext/mbstring,php-src/ext/pgsql avail|musone,chagenbu|php-src/ext/mcal avail|derick|php-src/ext/mcrypt -avail|alan_k|php-src/ext/midgard avail|fmk|php-src/ext/mssql avail|georg|php-src/ext/mysql avail|georg,nicos|php-src/ext/mysqli -- 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/zlib zlib_filter.c
pollita Tue Nov 22 17:05:40 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/zlib zlib_filter.c
Log:
Widen allowable range of values for 'window' bits.
Make -MAX_WBITS default (to match gzinflate() and gzdeflate())
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib_filter.c?r1=1.6r2=1.6.2.1ty=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6
php-src/ext/zlib/zlib_filter.c:1.6.2.1
--- php-src/ext/zlib/zlib_filter.c:1.6 Wed Aug 3 10:08:25 2005
+++ php-src/ext/zlib/zlib_filter.c Tue Nov 22 17:05:38 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: zlib_filter.c,v 1.6 2005/08/03 14:08:25 sniper Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.1 2005/11/22 22:05:38 pollita Exp $ */
#include php.h
#include php_zlib.h
@@ -303,7 +303,7 @@
data-strm.data_type = Z_ASCII;
if (strcasecmp(filtername, zlib.inflate) == 0) {
- int windowBits = MAX_WBITS;
+ int windowBits = -MAX_WBITS;
if (filterparams) {
zval **tmpzval;
@@ -313,7 +313,7 @@
/* log-2 base of history window (9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) 9 ||
Z_LVAL_PP(tmpzval) MAX_WBITS) {
+ if (Z_LVAL_PP(tmpzval) -MAX_WBITS ||
Z_LVAL_PP(tmpzval) MAX_WBITS) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, Invalid parameter give for window size. (%ld), Z_LVAL_PP(tmpzval));
} else {
windowBits = Z_LVAL_PP(tmpzval);
@@ -328,7 +328,7 @@
} else if (strcasecmp(filtername, zlib.deflate) == 0) {
/* RFC 1951 Deflate */
int level = Z_DEFAULT_COMPRESSION;
- int windowBits = MAX_WBITS;
+ int windowBits = -MAX_WBITS;
int memLevel = MAX_MEM_LEVEL;
@@ -357,7 +357,7 @@
/* log-2 base of history window
(9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) 9 ||
Z_LVAL_PP(tmpzval) MAX_WBITS) {
+ if (Z_LVAL_PP(tmpzval)
-MAX_WBITS || Z_LVAL_PP(tmpzval) MAX_WBITS) {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, Invalid parameter give for window size. (%ld),
Z_LVAL_PP(tmpzval));
} else {
windowBits =
Z_LVAL_PP(tmpzval);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zlib zlib_filter.c
pollita Tue Nov 22 17:08:22 2005 EDT
Modified files:
/php-src/ext/zlib zlib_filter.c
Log:
MFB (r-1.6.2.1)
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib_filter.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.7 php-src/ext/zlib/zlib_filter.c:1.8
--- php-src/ext/zlib/zlib_filter.c:1.7 Thu Aug 11 19:36:02 2005
+++ php-src/ext/zlib/zlib_filter.c Tue Nov 22 17:08:22 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: zlib_filter.c,v 1.7 2005/08/11 23:36:02 andrei Exp $ */
+/* $Id: zlib_filter.c,v 1.8 2005/11/22 22:08:22 pollita Exp $ */
#include php.h
#include php_zlib.h
@@ -320,7 +320,7 @@
data-strm.data_type = Z_ASCII;
if (strcasecmp(filtername, zlib.inflate) == 0) {
- int windowBits = MAX_WBITS;
+ int windowBits = -MAX_WBITS;
if (filterparams) {
zval **tmpzval;
@@ -330,7 +330,7 @@
/* log-2 base of history window (9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) 9 ||
Z_LVAL_PP(tmpzval) MAX_WBITS) {
+ if (Z_LVAL_PP(tmpzval) -MAX_WBITS ||
Z_LVAL_PP(tmpzval) MAX_WBITS) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, Invalid parameter give for window size. (%ld), Z_LVAL_PP(tmpzval));
} else {
windowBits = Z_LVAL_PP(tmpzval);
@@ -345,7 +345,7 @@
} else if (strcasecmp(filtername, zlib.deflate) == 0) {
/* RFC 1951 Deflate */
int level = Z_DEFAULT_COMPRESSION;
- int windowBits = MAX_WBITS;
+ int windowBits = -MAX_WBITS;
int memLevel = MAX_MEM_LEVEL;
@@ -374,7 +374,7 @@
/* log-2 base of history window
(9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) 9 ||
Z_LVAL_PP(tmpzval) MAX_WBITS) {
+ if (Z_LVAL_PP(tmpzval)
-MAX_WBITS || Z_LVAL_PP(tmpzval) MAX_WBITS) {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, Invalid parameter give for window size. (%ld),
Z_LVAL_PP(tmpzval));
} else {
windowBits =
Z_LVAL_PP(tmpzval);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c
I am preparing the patch for PHP_5_1, PHP_5_0 and HEAD.
It will be applied very soon.
Rui
On Tue, 22 Nov 2005 04:01:36 +0200 (EET)
Jani Taskinen [EMAIL PROTECTED] wrote:
Doesn't this problem exist in PHP_5_1 branch?
--Jani
On Mon, 21 Nov 2005, Rui Hirokawa wrote:
hirokawaMon Nov 21 18:21:24 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstringmbstring.c
Log:
fixed #35307 unexpected header can be injected to mb_send_mail() (the
patch is made by masugata).
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.4r2=1.142.2.47.2.5ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.4
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.5
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.4 Sat Nov 19 01:39:39 2005
+++ php-src/ext/mbstring/mbstring.c Mon Nov 21 18:21:19 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.4 2005/11/19 06:39:39 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.5 2005/11/21 23:21:19 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -3467,6 +3467,22 @@
* Sends an email message with MIME scheme
*/
#if HAVE_SENDMAIL
+#define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos)
\
+ if (str[pos] == '\r' str[pos + 1] == '\n' (str[pos + 2] == ' ' ||
str[pos + 2] == '\t')) {\
+ pos += 3;
\
+ while (str[pos] == ' ' || str[pos] == '\t') { \
+ pos++;
\
+ } \
+ continue;
\
+ }
\
+ else if (str[pos] == '\n' (str[pos + 1] == ' ' || str[pos + 1] ==
'\t')) { \
+ pos += 2;
\
+ while (str[pos] == ' ' || str[pos] == '\t') { \
+ pos++;
\
+ }
\
+ continue;
\
+ }
\
+
PHP_FUNCTION(mb_send_mail)
{
int argc, n;
@@ -3482,6 +3498,8 @@
mbfl_memory_device device; /* automatic allocateable buffer for
additional header */
const mbfl_language *lang;
int err = 0;
+ char *to_r;
+ int to_len, i;
/* initialize */
mbfl_memory_device_init(device, 0, 0);
@@ -3508,6 +3526,32 @@
convert_to_string_ex(argv[0]);
if (Z_STRVAL_PP(argv[0])) {
to = Z_STRVAL_PP(argv[0]);
+ to_len = Z_STRLEN_PP(argv[0]);
+ if (to_len 0) {
+ to_r = estrndup(to, to_len);
+ for (; to_len; to_len--) {
+ if (!isspace((unsigned char) to_r[to_len - 1]))
{
+ break;
+ }
+ to_r[to_len - 1] = '\0';
+ }
+ for (i = 0; to_r[i]; i++) {
+ if (iscntrl((unsigned char) to_r[i])) {
+ /* According to RFC 822,
section 3.1.1 long headers may be
+separated into
+* parts using CRLF followed at least
one linear-white-space
+character ('\t' or ' ').
+* To prevent these separators from
being replaced with a space,
+we use the
+* SKIP_LONG_HEADER_SEP_MBSTRING to
skip over them.
+*/
+ SKIP_LONG_HEADER_SEP_MBSTRING(to_r, i);
+ to_r[i] = ' ';
+ }
+ }
+ } else {
+ to_r = to;
+ }
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Missing To:
field);
err = 1;
@@ -3606,12 +3650,15 @@
extra_cmd = php_escape_shell_cmd(extra_cmd);
}
- if (!err php_mail(to, subject, message, headers, extra_cmd
TSRMLS_CC)) {
+ if (!err
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard php_fopen_wrapper.c
pollita Tue Nov 22 17:36:18 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard php_fopen_wrapper.c
Log:
Bugfix #35315 stream-position != stream-abstract
http://cvs.php.net/diff.php/php-src/ext/standard/php_fopen_wrapper.c?r1=1.29.2.4.8.1r2=1.29.2.4.8.2ty=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4.8.1
php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4.8.2
--- php-src/ext/standard/php_fopen_wrapper.c:1.29.2.4.8.1 Thu Nov 17
14:41:02 2005
+++ php-src/ext/standard/php_fopen_wrapper.cTue Nov 22 17:36:14 2005
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.29.2.4.8.1 2005/11/17 19:41:02 pollita Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.29.2.4.8.2 2005/11/22 22:36:14 pollita Exp $ */
#include stdio.h
#include stdlib.h
@@ -73,7 +73,7 @@
static size_t php_stream_input_read(php_stream *stream, char *buf, size_t
count TSRMLS_DC)
{
- off_t *position = (off_t*)stream-position;
+ off_t *position = (off_t*)stream-abstract;
size_t read_bytes = 0;
if(!stream-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) / NEWS /ext/curl config.m4
tony2001Tue Nov 22 17:53:34 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS /php-src/ext/curl config.m4 Log: fix #35341 (Fix for bug #33760 breaks build with older curl) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.212r2=1.2027.2.213ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.212 php-src/NEWS:1.2027.2.213 --- php-src/NEWS:1.2027.2.212 Sun Nov 20 15:14:21 2005 +++ php-src/NEWSTue Nov 22 17:53:32 2005 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Nov 2005, PHP 5.1 +- Fixed bug #35341 (Fix for bug #33760 breaks build with older curl). (Tony) - Fixed bug #35303 (PDO prepare() crashes with invalid parameters). (Ilia) - Fixed bug #35293 (PDO segfaults when using persistent connections). (Tony) - Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia) http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.28.2.2r2=1.28.2.3ty=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.28.2.2 php-src/ext/curl/config.m4:1.28.2.3 --- php-src/ext/curl/config.m4:1.28.2.2 Wed Oct 26 07:33:25 2005 +++ php-src/ext/curl/config.m4 Tue Nov 22 17:53:34 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28.2.2 2005/10/26 11:33:25 sniper Exp $ +dnl $Id: config.m4,v 1.28.2.3 2005/11/22 22:53:34 tony2001 Exp $ dnl PHP_ARG_WITH(curl, for CURL support, @@ -50,7 +50,7 @@ fi AC_MSG_CHECKING([for SSL support in libcurl]) - CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL` + CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` if test $CURL_SSL = SSL; then AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) -- 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 /ext/curl config.m4
tony2001Tue Nov 22 17:53:51 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS /php-src/ext/curl config.m4 Log: MF51: fix #35341 (Fix for bug #33760 breaks build with older curl) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.88r2=1.1247.2.920.2.89ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.88 php-src/NEWS:1.1247.2.920.2.89 --- php-src/NEWS:1.1247.2.920.2.88 Fri Nov 18 16:24:05 2005 +++ php-src/NEWSTue Nov 22 17:53:48 2005 @@ -1,6 +1,7 @@ PHP 4 NEWS ||| 23 Nov 2005, Version 4.4.2 +- Fixed bug #35341 (Fix for bug #33760 breaks build with older curl). (Tony) - Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia) - Fixed bug #33153 (crash in mssql_next result). (Frank) - Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank) http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.20.2.2.2.1r2=1.20.2.2.2.2ty=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.20.2.2.2.1 php-src/ext/curl/config.m4:1.20.2.2.2.2 --- php-src/ext/curl/config.m4:1.20.2.2.2.1 Wed Nov 2 10:03:36 2005 +++ php-src/ext/curl/config.m4 Tue Nov 22 17:53:50 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.20.2.2.2.1 2005/11/02 15:03:36 mike Exp $ +dnl $Id: config.m4,v 1.20.2.2.2.2 2005/11/22 22:53:50 tony2001 Exp $ dnl PHP_ARG_WITH(curl, for CURL support, @@ -50,21 +50,21 @@ fi AC_MSG_CHECKING([for SSL support in libcurl]) - CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL` - if test $CURL_SSL == SSL; then + CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` + if test $CURL_SSL = SSL; then AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) AC_MSG_CHECKING([for SSL library used]) CURL_SSL_FLAVOUR= for i in $CURL_LIBS; do - if test $i == -lssl; then + if test $i = -lssl; then CURL_SSL_FLAVOUR=openssl AC_MSG_RESULT([openssl]) AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support]) AC_CHECK_HEADERS([openssl/crypto.h]) break - elif test $i == -lgnutls; then + elif test $i = -lgnutls; then CURL_SSL_FLAVOUR=gnutls AC_MSG_RESULT([gnutls]) AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4
tony2001Tue Nov 22 17:54:22 2005 EDT Modified files: /php-src/ext/curl config.m4 Log: MF51: fix #35341 (Fix for bug #33760 breaks build with older curl) http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.31r2=1.32ty=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.31 php-src/ext/curl/config.m4:1.32 --- php-src/ext/curl/config.m4:1.31 Thu Nov 10 03:04:57 2005 +++ php-src/ext/curl/config.m4 Tue Nov 22 17:54:22 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.31 2005/11/10 08:04:57 sniper Exp $ +dnl $Id: config.m4,v 1.32 2005/11/22 22:54:22 tony2001 Exp $ dnl PHP_ARG_WITH(curl, for cURL support, @@ -50,7 +50,7 @@ fi AC_MSG_CHECKING([for SSL support in libcurl]) - CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL` + CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` if test $CURL_SSL = SSL; then AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) -- 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) / UPGRADING
iliaa Tue Nov 22 18:49:15 2005 EDT Added files: (Branch: PHP_5_1) /php-srcUPGRADING Log: Added 5.1 upgrading notes. # Big thanks to Steph Fox for taking the time to make this list possible. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / LICENSE
rasmus Tue Nov 22 19:08:01 2005 EDT Modified files: /php-srcLICENSE Log: 3.01 license - we technically don't need to switch the PHP sources to this one, it is more for pear/pecl, but to be consistent we probably should. Anybody want to do the sed magic to fix all the headers? http://cvs.php.net/diff.php/php-src/LICENSE?r1=1.23r2=1.24ty=u Index: php-src/LICENSE diff -u php-src/LICENSE:1.23 php-src/LICENSE:1.24 --- php-src/LICENSE:1.23Fri Mar 25 11:13:47 2005 +++ php-src/LICENSE Tue Nov 22 19:08:00 2005 @@ -1,5 +1,5 @@ - The PHP License, Version 3.0 + The PHP License, version 3.01 Copyright (c) 1999 - 2005 The PHP Group. All rights reserved. @@ -38,8 +38,8 @@ 6. Redistributions of any form whatsoever must retain the following acknowledgment: - This product includes PHP, freely available from - http://www.php.net/. + This product includes PHP software, freely available from + http://www.php.net/software/. THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, @@ -64,5 +64,5 @@ For more information on the PHP Group and the PHP project, please see http://www.php.net. -This product includes the Zend Engine, freely available at +PHP includes the Zend Engine, freely available at http://www.zend.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_1) / NEWS /ext/standard info.c
iliaa Tue Nov 22 19:15:11 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/standard info.c
Log:
Fixed bug #35046 (phpinfo() uses improper css enclosure).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.213r2=1.2027.2.214ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.213 php-src/NEWS:1.2027.2.214
--- php-src/NEWS:1.2027.2.213 Tue Nov 22 17:53:32 2005
+++ php-src/NEWSTue Nov 22 19:15:05 2005
@@ -9,6 +9,7 @@
- Fixed bug #35243 (php_mblen() crashes when compiled with thread-safety
on Linux). (Patch: shulmanb at il dot ibm dot com, Jani)
- Fixed bug #35143 (gettimeofday() ignores current time zone). (Derick)
+- Fixed bug #35046 (phpinfo() uses improper css enclosure). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
- Fixed bug #33201 (Crash when fetching some data types). (Frank)
http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.249.2.4r2=1.249.2.5ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.4
php-src/ext/standard/info.c:1.249.2.5
--- php-src/ext/standard/info.c:1.249.2.4 Sat Aug 27 21:03:41 2005
+++ php-src/ext/standard/info.c Tue Nov 22 19:15:08 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.4 2005/08/28 01:03:41 sniper Exp $ */
+/* $Id: info.c,v 1.249.2.5 2005/11/23 00:15:08 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -203,9 +203,9 @@
*/
void php_info_print_style(TSRMLS_D)
{
- php_printf(style type=\text/css\!--\n);
+ php_printf(style type=\text/css\\n);
php_info_print_css(TSRMLS_C);
- php_printf(//--/style\n);
+ php_printf(/style\n);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard info.c
iliaa Tue Nov 22 19:15:27 2005 EDT
Modified files:
/php-src/ext/standard info.c
Log:
MFB51: Fixed bug #35046 (phpinfo() uses improper css enclosure).
http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.255r2=1.256ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.255 php-src/ext/standard/info.c:1.256
--- php-src/ext/standard/info.c:1.255 Sat Aug 27 21:02:54 2005
+++ php-src/ext/standard/info.c Tue Nov 22 19:15:26 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.255 2005/08/28 01:02:54 sniper Exp $ */
+/* $Id: info.c,v 1.256 2005/11/23 00:15:26 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -205,9 +205,9 @@
*/
void php_info_print_style(TSRMLS_D)
{
- php_printf(style type=\text/css\!--\n);
+ php_printf(style type=\text/css\\n);
php_info_print_css(TSRMLS_C);
- php_printf(//--/style\n);
+ php_printf(/style\n);
}
/* }}} */
--
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) /ext/standard info.c
iliaa Tue Nov 22 19:17:17 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard info.c
Log:
MFH: Fixed bug #35046 (phpinfo() uses improper css enclosure).
http://cvs.php.net/diff.php/php-src/ext/standard/info.c?r1=1.218.2.18.2.4r2=1.218.2.18.2.5ty=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.218.2.18.2.4
php-src/ext/standard/info.c:1.218.2.18.2.5
--- php-src/ext/standard/info.c:1.218.2.18.2.4 Mon Aug 15 20:26:02 2005
+++ php-src/ext/standard/info.c Tue Nov 22 19:17:17 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.218.2.18.2.4 2005/08/16 00:26:02 iliaa Exp $ */
+/* $Id: info.c,v 1.218.2.18.2.5 2005/11/23 00:17:17 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -195,9 +195,9 @@
*/
void php_info_print_style()
{
- php_printf(style type=\text/css\!--\n);
+ php_printf(style type=\text/css\\n);
php_info_print_css();
- php_printf(//--/style\n);
+ php_printf(/style\n);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / LICENSE
How about changing the headers to say: This source file is subject to latest version of the PHP license =) --Jani On Wed, 23 Nov 2005, Rasmus Lerdorf wrote: rasmus Tue Nov 22 19:08:01 2005 EDT Modified files: /php-src LICENSE Log: 3.01 license - we technically don't need to switch the PHP sources to this one, it is more for pear/pecl, but to be consistent we probably should. Anybody want to do the sed magic to fix all the headers? http://cvs.php.net/diff.php/php-src/LICENSE?r1=1.23r2=1.24ty=u Index: php-src/LICENSE diff -u php-src/LICENSE:1.23 php-src/LICENSE:1.24 --- php-src/LICENSE:1.23Fri Mar 25 11:13:47 2005 +++ php-src/LICENSE Tue Nov 22 19:08:00 2005 @@ -1,5 +1,5 @@ - The PHP License, Version 3.0 + The PHP License, version 3.01 Copyright (c) 1999 - 2005 The PHP Group. All rights reserved. @@ -38,8 +38,8 @@ 6. Redistributions of any form whatsoever must retain the following acknowledgment: - This product includes PHP, freely available from - http://www.php.net/. + This product includes PHP software, freely available from + http://www.php.net/software/. THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, @@ -64,5 +64,5 @@ For more information on the PHP Group and the PHP project, please see http://www.php.net. -This product includes the Zend Engine, freely available at +PHP includes the Zend Engine, freely available at http://www.zend.com. -- Give me your money at @ http://pecl.php.net/wishlist.php/sniper Donating money may make me happier and friendlier for a limited period! Death to all 4 letter abbreviations starting with P! -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / LICENSE
Jani Taskinen wrote: How about changing the headers to say: This source file is subject to latest version of the PHP license Or make it part of the annual Copyright year change patch. There is no rush on this one. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom php_dom.c
rrichards Tue Nov 22 19:55:35 2005 EDT
Modified files:
/php-src/ext/domphp_dom.c
Log:
Fixed bug #35342 (isset(DOMNodeList-length) returns false).
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.83r2=1.84ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.83 php-src/ext/dom/php_dom.c:1.84
--- php-src/ext/dom/php_dom.c:1.83 Tue Nov 15 10:21:44 2005
+++ php-src/ext/dom/php_dom.c Tue Nov 22 19:55:34 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.83 2005/11/15 15:21:44 dmitry Exp $ */
+/* $Id: php_dom.c,v 1.84 2005/11/23 00:55:34 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -324,6 +324,41 @@
}
/* }}} */
+/* {{{ dom_property_exists */
+static int dom_property_exists(zval *object, zval *member, int check_empty
TSRMLS_DC)
+{
+ dom_object *obj;
+ zval tmp_member;
+ dom_prop_handler *hnd;
+ zend_object_handlers *std_hnd;
+ int ret, retval=0;
+
+ if (member-type != IS_STRING member-type != IS_UNICODE) {
+ tmp_member = *member;
+ zval_copy_ctor(tmp_member);
+ convert_to_text(tmp_member);
+ member = tmp_member;
+ }
+
+ ret = FAILURE;
+ obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC);
+
+ if (obj-prop_handler != NULL) {
+ ret = zend_u_hash_find(obj-prop_handler, Z_TYPE_P(member),
Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, (void **) hnd);
+ }
+ if (ret == SUCCESS) {
+ retval = 1;
+ } else {
+ std_hnd = zend_get_std_object_handlers();
+ retval = std_hnd-has_property(object, member, check_empty
TSRMLS_CC);
+ }
+
+ if (member == tmp_member) {
+ zval_dtor(member);
+ }
+ return retval;
+}
+/* }}} */
void *php_dom_export_node(zval *object TSRMLS_DC)
{
@@ -485,12 +520,14 @@
dom_object_handlers.write_property = dom_write_property;
dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
+ dom_object_handlers.has_property = dom_property_exists;
memcpy(dom_ze1_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
dom_ze1_object_handlers.read_property = dom_read_property;
dom_ze1_object_handlers.write_property = dom_write_property;
dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj;
+ dom_ze1_object_handlers.has_property = dom_property_exists;
zend_hash_init(classes, 0, NULL, (void (*)(void
*))dom_prop_handlers_dtor, 1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom attr.c element.c
rrichards Tue Nov 22 21:52:57 2005 EDT
Modified files:
/php-src/ext/domelement.c attr.c
Log:
implement setIDAttributeXXX functionality
http://cvs.php.net/diff.php/php-src/ext/dom/element.c?r1=1.39r2=1.40ty=u
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.39 php-src/ext/dom/element.c:1.40
--- php-src/ext/dom/element.c:1.39 Thu Oct 27 19:49:34 2005
+++ php-src/ext/dom/element.c Tue Nov 22 21:52:56 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: element.c,v 1.39 2005/10/27 23:49:34 rrichards Exp $ */
+/* $Id: element.c,v 1.40 2005/11/23 02:52:56 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -910,13 +910,57 @@
/* }}} end dom_element_has_attribute_ns */
+static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id)
+{
+ if (is_id == 1 attrp-atype != XML_ATTRIBUTE_ID) {
+ xmlChar *id_val;
+
+ id_val = xmlNodeListGetString(attrp-doc, attrp-children, 1);
+ if (id_val != NULL) {
+ xmlAddID(NULL, attrp-doc, id_val, attrp);
+ xmlFree(id_val);
+ }
+ } else {
+ if (attrp-atype == XML_ATTRIBUTE_ID) {
+ xmlRemoveID(attrp-doc, attrp);
+ attrp-atype = 0;
+ }
+ }
+}
+
/* {{{ proto void dom_element_set_id_attribute(string name, boolean isId);
URL:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr
Since: DOM Level 3
*/
PHP_FUNCTION(dom_element_set_id_attribute)
{
- DOM_NOT_IMPLEMENTED();
+ zval *id;
+ xmlNode *nodep;
+ xmlAttrPtr attrp;
+ dom_object *intern;
+ char *name;
+ int name_len;
+ zend_bool is_id;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
Osb, id, U_CLASS_ENTRY(dom_element_class_entry), name, name_len, is_id)
== FAILURE) {
+ return;
+ }
+
+ DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
+
+ if (dom_node_is_read_only(nodep) == SUCCESS) {
+ php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR,
dom_get_strict_error(intern-document) TSRMLS_CC);
+ RETURN_NULL();
+ }
+
+ attrp = xmlHasNsProp(nodep, name, NULL);
+ if (attrp == NULL) {
+ php_dom_throw_error(NOT_FOUND_ERR,
dom_get_strict_error(intern-document) TSRMLS_CC);
+ } else {
+ php_set_attribute_id(attrp, is_id);
+ }
+
+ RETURN_NULL();
}
/* }}} end dom_element_set_id_attribute */
@@ -927,7 +971,33 @@
*/
PHP_FUNCTION(dom_element_set_id_attribute_ns)
{
- DOM_NOT_IMPLEMENTED();
+ zval *id, *rv = NULL;
+ xmlNodePtr elemp;
+ xmlAttrPtr attrp;
+ dom_object *intern;
+ int uri_len, name_len, ret;
+ char *uri, *name;
+ zend_bool is_id;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
Ossb, id, U_CLASS_ENTRY(dom_element_class_entry), uri, uri_len, name,
name_len, is_id) == FAILURE) {
+ return;
+ }
+
+ DOM_GET_OBJ(elemp, id, xmlNodePtr, intern);
+
+ if (dom_node_is_read_only(elemp) == SUCCESS) {
+ php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR,
dom_get_strict_error(intern-document) TSRMLS_CC);
+ RETURN_NULL();
+ }
+
+ attrp = xmlHasNsProp(elemp, name, uri);
+ if (attrp == NULL) {
+ php_dom_throw_error(NOT_FOUND_ERR,
dom_get_strict_error(intern-document) TSRMLS_CC);
+ } else {
+ php_set_attribute_id(attrp, is_id);
+ }
+
+ RETURN_NULL();
}
/* }}} end dom_element_set_id_attribute_ns */
@@ -938,7 +1008,34 @@
*/
PHP_FUNCTION(dom_element_set_id_attribute_node)
{
- DOM_NOT_IMPLEMENTED();
+ zval *id, *node;
+ xmlNode *nodep;
+ xmlAttrPtr attrp;
+ dom_object *intern, *attrobj;
+ char *name;
+ int name_len;
+ zend_bool is_id;
+
+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
OOb, id, U_CLASS_ENTRY(dom_element_class_entry), node,
U_CLASS_ENTRY(dom_attr_class_entry), is_id) == FAILURE) {
+ return;
+ }
+
+ DOM_GET_OBJ(nodep, id, xmlNodePtr, intern);
+
+ if (dom_node_is_read_only(nodep) == SUCCESS) {
+ php_dom_throw_error(NO_MODIFICATION_ALLOWED_ERR,
dom_get_strict_error(intern-document) TSRMLS_CC);
+ RETURN_NULL();
+ }
+
+ DOM_GET_OBJ(attrp, node, xmlAttrPtr, attrobj);
+
+ if (attrp-parent != nodep) {
+ php_dom_throw_error(NOT_FOUND_ERR,
dom_get_strict_error(intern-document) TSRMLS_CC);
+ } else {
+ php_set_attribute_id(attrp, is_id);
+ }
+
+ RETURN_NULL();
}
/* }}} end dom_element_set_id_attribute_node */
http://cvs.php.net/diff.php/php-src/ext/dom/attr.c?r1=1.19r2=1.20ty=u
[PHP-CVS] cvs: php-src /ext/libxml libxml.c php_libxml.h
rrichards Tue Nov 22 21:54:10 2005 EDT
Modified files:
/php-src/ext/libxml libxml.c php_libxml.h
Log:
move document property struct from xml_common.h
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.39r2=1.40ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.39 php-src/ext/libxml/libxml.c:1.40
--- php-src/ext/libxml/libxml.c:1.39Thu Nov 17 16:57:30 2005
+++ php-src/ext/libxml/libxml.c Tue Nov 22 21:54:10 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.39 2005/11/17 21:57:30 rasmus Exp $ */
+/* $Id: libxml.c,v 1.40 2005/11/23 02:54:10 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -952,6 +952,10 @@
xmlFreeDoc((xmlDoc *) object-document-ptr);
}
if (object-document-doc_props != NULL) {
+ if (object-document-doc_props-classmap) {
+
zend_hash_destroy(object-document-doc_props-classmap);
+
FREE_HASHTABLE(object-document-doc_props-classmap);
+ }
efree(object-document-doc_props);
}
efree(object-document);
http://cvs.php.net/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.16r2=1.17ty=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.16
php-src/ext/libxml/php_libxml.h:1.17
--- php-src/ext/libxml/php_libxml.h:1.16Thu Sep 8 06:33:57 2005
+++ php-src/ext/libxml/php_libxml.h Tue Nov 22 21:54:10 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.16 2005/09/08 10:33:57 rrichards Exp $ */
+/* $Id: php_libxml.h,v 1.17 2005/11/23 02:54:10 rrichards Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -43,10 +43,21 @@
zend_llist *error_list;
} php_libxml_globals;
+typedef struct _libxml_doc_props {
+ int formatoutput;
+ int validateonparse;
+ int resolveexternals;
+ int preservewhitespace;
+ int substituteentities;
+ int stricterror;
+ int recover;
+ HashTable *classmap;
+} libxml_doc_props;
+
typedef struct _php_libxml_ref_obj {
void *ptr;
int refcount;
- void *doc_props;
+ libxml_doc_props *doc_props;
} php_libxml_ref_obj;
typedef struct _php_libxml_node_ptr {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/dom document.c dom_fe.h php_dom.c php_dom.h xml_common.h
rrichards Tue Nov 22 21:56:42 2005 EDT
Modified files:
/php-src/ext/domphp_dom.c document.c php_dom.h dom_fe.h
xml_common.h
Log:
add registerNodeClass() method
- methods can now natively return user classes registered with document
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.84r2=1.85ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.84 php-src/ext/dom/php_dom.c:1.85
--- php-src/ext/dom/php_dom.c:1.84 Tue Nov 22 19:55:34 2005
+++ php-src/ext/dom/php_dom.c Tue Nov 22 21:56:41 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.84 2005/11/23 00:55:34 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.85 2005/11/23 02:56:41 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -127,12 +127,12 @@
/* {{{ dom_get_doc_props() */
dom_doc_propsptr dom_get_doc_props(php_libxml_ref_obj *document)
{
- dom_doc_props *doc_props;
+ dom_doc_propsptr doc_props;
if (document document-doc_props) {
return document-doc_props;
} else {
- doc_props = emalloc(sizeof(dom_doc_props));
+ doc_props = emalloc(sizeof(libxml_doc_props));
doc_props-formatoutput = 0;
doc_props-validateonparse = 0;
doc_props-resolveexternals = 0;
@@ -140,18 +140,58 @@
doc_props-substituteentities = 0;
doc_props-stricterror = 1;
doc_props-recover = 0;
+ doc_props-classmap = NULL;
if (document) {
document-doc_props = doc_props;
}
return doc_props;
}
}
+
+int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry
*basece, zend_class_entry *ce TSRMLS_DC)
+{
+ dom_doc_propsptr doc_props;
+
+ if (document) {
+ doc_props = dom_get_doc_props(document);
+ if (doc_props-classmap == NULL) {
+ if (ce == NULL) {
+ return SUCCESS;
+ }
+ ALLOC_HASHTABLE(doc_props-classmap);
+ zend_u_hash_init(doc_props-classmap, 0, NULL, NULL, 0,
UG(unicode));
+ }
+ if (ce) {
+ return zend_u_hash_add(doc_props-classmap,
UG(unicode)?IS_UNICODE:IS_STRING, basece-name, basece-name_length + 1, ce,
sizeof(ce), NULL);
+ } else {
+ return zend_u_hash_del(doc_props-classmap,
UG(unicode)?IS_UNICODE:IS_STRING, basece-name, basece-name_length + 1);
+ }
+ }
+ return SUCCESS;
+}
+
+zend_class_entry *dom_get_doc_classmap(php_libxml_ref_obj *document,
zend_class_entry *basece TSRMLS_DC)
+{
+ dom_doc_propsptr doc_props;
+ zend_class_entry **ce = NULL;
+
+ if (document) {
+ doc_props = dom_get_doc_props(document);
+ if (doc_props-classmap) {
+ if (zend_u_hash_find(doc_props-classmap,
UG(unicode)?IS_UNICODE:IS_STRING, basece-name, basece-name_length + 1,
(void**) ce) == SUCCESS) {
+ return *ce;
+ }
+ }
+ }
+
+ return basece;
+}
/* }}} */
/* {{{ dom_get_strict_error() */
int dom_get_strict_error(php_libxml_ref_obj *document) {
int stricterror;
- dom_doc_props *doc_props;
+ dom_doc_propsptr doc_props;
doc_props = dom_get_doc_props(document);
stricterror = doc_props-stricterror;
@@ -1240,6 +1280,9 @@
return wrapper;
}
+ if (domobj domobj-document) {
+ ce = dom_get_doc_classmap(domobj-document, ce TSRMLS_CC);
+ }
object_init_ex(wrapper, ce);
intern = (dom_object *)zend_objects_get_address(wrapper TSRMLS_CC);
http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.71r2=1.72ty=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.71 php-src/ext/dom/document.c:1.72
--- php-src/ext/dom/document.c:1.71 Thu Sep 8 06:34:37 2005
+++ php-src/ext/dom/document.c Tue Nov 22 21:56:41 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: document.c,v 1.71 2005/09/08 10:34:37 rrichards Exp $ */
+/* $Id: document.c,v 1.72 2005/11/23 02:56:41 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -85,6 +85,7 @@
PHP_FALIAS(relaxNGValidate, dom_document_relaxNG_validate_file, NULL)
PHP_FALIAS(relaxNGValidateSource, dom_document_relaxNG_validate_xml,
NULL)
#endif
+ PHP_ME(domdocument, registerNodeClass, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}
};
@@ -384,7 +385,7 @@
*/
int dom_document_strict_error_checking_read(dom_object *obj, zval **retval
TSRMLS_DC)
{
- dom_doc_props
[PHP-CVS] cvs: php-src /ext/dom/tests bug35342.phpt
rrichards Tue Nov 22 22:10:46 2005 EDT
Added files:
/php-src/ext/dom/tests bug35342.phpt
Log:
add test
http://cvs.php.net/co.php/php-src/ext/dom/tests/bug35342.phpt?r=1.1p=1
Index: php-src/ext/dom/tests/bug35342.phpt
+++ php-src/ext/dom/tests/bug35342.phpt
--TEST--
Bug # 35342: isset(DOMNodeList-length) returns false
--SKIPIF--
?php require_once('skipif.php'); ?
--FILE--
?php
$dom = new DOMDocument();
$dom-loadXML(rootfoofoobar/foofoofoobar#2/foo/root);
$nodelist = $dom-getElementsByTagName(foo);
var_dump($nodelist-length, isset($nodelist-length), isset($nodelist-foo));
?
--EXPECT--
int(2)
bool(true)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/dom php_dom.c /ext/dom/tests bug35342.phpt
rrichards Tue Nov 22 22:12:47 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/dom/tests bug35342.phpt
Modified files:
/php-src/ext/domphp_dom.c
Log:
Fixed bug #35342 (isset(DOMNodeList-length) returns false)
add test
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.73.2.5r2=1.73.2.6ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.5 php-src/ext/dom/php_dom.c:1.73.2.6
--- php-src/ext/dom/php_dom.c:1.73.2.5 Tue Nov 15 09:18:15 2005
+++ php-src/ext/dom/php_dom.c Tue Nov 22 22:12:45 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.73.2.5 2005/11/15 14:18:15 dmitry Exp $ */
+/* $Id: php_dom.c,v 1.73.2.6 2005/11/23 03:12:45 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -346,6 +346,41 @@
}
/* }}} */
+/* {{{ dom_property_exists */
+static int dom_property_exists(zval *object, zval *member, int check_empty
TSRMLS_DC)
+{
+ dom_object *obj;
+ zval tmp_member;
+ dom_prop_handler *hnd;
+ zend_object_handlers *std_hnd;
+ int ret, retval=0;
+
+ if (member-type != IS_STRING) {
+ tmp_member = *member;
+ zval_copy_ctor(tmp_member);
+ convert_to_string(tmp_member);
+ member = tmp_member;
+ }
+
+ ret = FAILURE;
+ obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC);
+
+ if (obj-prop_handler != NULL) {
+ ret = zend_hash_find((HashTable *)obj-prop_handler,
Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) hnd);
+ }
+ if (ret == SUCCESS) {
+ retval = 1;
+ } else {
+ std_hnd = zend_get_std_object_handlers();
+ retval = std_hnd-has_property(object, member, check_empty
TSRMLS_CC);
+ }
+
+ if (member == tmp_member) {
+ zval_dtor(member);
+ }
+ return retval;
+}
+/* }}} */
void *php_dom_export_node(zval *object TSRMLS_DC)
{
@@ -468,12 +503,14 @@
dom_object_handlers.write_property = dom_write_property;
dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
+ dom_object_handlers.has_property = dom_property_exists;
memcpy(dom_ze1_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
dom_ze1_object_handlers.read_property = dom_read_property;
dom_ze1_object_handlers.write_property = dom_write_property;
dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj;
+ dom_ze1_object_handlers.has_property = dom_property_exists;
zend_hash_init(classes, 0, NULL, NULL, 1);
http://cvs.php.net/co.php/php-src/ext/dom/tests/bug35342.phpt?r=1.1p=1
Index: php-src/ext/dom/tests/bug35342.phpt
+++ php-src/ext/dom/tests/bug35342.phpt
--TEST--
Bug # 35342: isset(DOMNodeList-length) returns false
--SKIPIF--
?php require_once('skipif.php'); ?
--FILE--
?php
$dom = new DOMDocument();
$dom-loadXML(rootfoofoobar/foofoofoobar#2/foo/root);
$nodelist = $dom-getElementsByTagName(foo);
var_dump($nodelist-length, isset($nodelist-length), isset($nodelist-foo));
?
--EXPECT--
int(2)
bool(true)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
rrichards Tue Nov 22 22:14:00 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.214r2=1.2027.2.215ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.214 php-src/NEWS:1.2027.2.215 --- php-src/NEWS:1.2027.2.214 Tue Nov 22 19:15:05 2005 +++ php-src/NEWSTue Nov 22 22:13:57 2005 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Nov 2005, PHP 5.1 +- Fixed bug #35342 (isset(DOMNodeList-length) returns false). (Rob) - Fixed bug #35341 (Fix for bug #33760 breaks build with older curl). (Tony) - Fixed bug #35303 (PDO prepare() crashes with invalid parameters). (Ilia) - Fixed bug #35293 (PDO segfaults when using persistent connections). (Tony) -- 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/zlib zlib_filter.c
Hi Sara,
Seems you broke something:
ext/zlib/tests/zlib_filter_deflate.phpt
ext/zlib/tests/zlib_filter_inflate.phpt
Thanks. Dmitry.
-Original Message-
From: Sara Golemon [mailto:[EMAIL PROTECTED]
Sent: Wednesday, November 23, 2005 1:06 AM
To: php-cvs@lists.php.net
Subject: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/zlib zlib_filter.c
pollita Tue Nov 22 17:05:40 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/zlib zlib_filter.c
Log:
Widen allowable range of values for 'window' bits.
Make -MAX_WBITS default (to match gzinflate() and gzdeflate())
http://cvs.php.net/diff.php/php-src/ext/zlib/zlib_filter.c?r1=
1.6r2=1.6.2.1ty=u
Index: php-src/ext/zlib/zlib_filter.c
diff -u php-src/ext/zlib/zlib_filter.c:1.6
php-src/ext/zlib/zlib_filter.c:1.6.2.1
--- php-src/ext/zlib/zlib_filter.c:1.6Wed Aug 3 10:08:25 2005
+++ php-src/ext/zlib/zlib_filter.cTue Nov 22 17:05:38 2005
@@ -16,7 +16,7 @@
+-
-+
*/
-/* $Id: zlib_filter.c,v 1.6 2005/08/03 14:08:25 sniper Exp $ */
+/* $Id: zlib_filter.c,v 1.6.2.1 2005/11/22 22:05:38 pollita Exp $ */
#include php.h
#include php_zlib.h
@@ -303,7 +303,7 @@
data-strm.data_type = Z_ASCII;
if (strcasecmp(filtername, zlib.inflate) == 0) {
- int windowBits = MAX_WBITS;
+ int windowBits = -MAX_WBITS;
if (filterparams) {
zval **tmpzval;
@@ -313,7 +313,7 @@
/* log-2 base of history window
(9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
- if (Z_LVAL_PP(tmpzval) 9 ||
Z_LVAL_PP(tmpzval) MAX_WBITS) {
+ if (Z_LVAL_PP(tmpzval)
-MAX_WBITS || Z_LVAL_PP(tmpzval)
+MAX_WBITS) {
php_error_docref(NULL
TSRMLS_CC, E_WARNING, Invalid parameter give for window
size. (%ld), Z_LVAL_PP(tmpzval));
} else {
windowBits = Z_LVAL_PP(tmpzval);
@@ -328,7 +328,7 @@
} else if (strcasecmp(filtername, zlib.deflate) == 0) {
/* RFC 1951 Deflate */
int level = Z_DEFAULT_COMPRESSION;
- int windowBits = MAX_WBITS;
+ int windowBits = -MAX_WBITS;
int memLevel = MAX_MEM_LEVEL;
@@ -357,7 +357,7 @@
/* log-2 base
of history window (9 - 15) */
SEPARATE_ZVAL(tmpzval);
convert_to_long_ex(tmpzval);
- if
(Z_LVAL_PP(tmpzval) 9 || Z_LVAL_PP(tmpzval) MAX_WBITS) {
+ if
(Z_LVAL_PP(tmpzval) -MAX_WBITS || Z_LVAL_PP(tmpzval)
+MAX_WBITS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
parameter give for window size. (%ld), Z_LVAL_PP(tmpzval));
} else {
windowBits = Z_LVAL_PP(tmpzval);
--
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
