[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Nov 9 20:49:02 2004 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1798r2=1.1799ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1798 php-src/ChangeLog:1.1799 --- php-src/ChangeLog:1.1798Mon Nov 8 20:47:08 2004 +++ php-src/ChangeLog Tue Nov 9 20:48:53 2004 @@ -1,3 +1,46 @@ +2004-11-09 Andrei Zmievski [EMAIL PROTECTED] + +* ZendEngine2/zend_ini_parser.y: + Revert inadvertent commit. + +* acinclude.m4 + ZendEngine2/zend_ini_parser.y: + .dylib extension are Mach-O shared libraries that meant for linking + against. Loadable modules (aka bundles) can have any extension, so we + should probably stick with .so + + http://fink.sourceforge.net/doc/porting/shared.php?phpLang=en#lib-and-mod + +2004-11-09 Joe Orton [EMAIL PROTECTED] + +* ext/recode/config9.m4: + Fix --with-recode since PHP_YAZ is never defined. + +* ext/standard/config.m4: + Make the rounding fuzz check work again with gcc 3.3 and later, + fixing the bug24142 test. + +2004-11-09 Frank M. Kromann [EMAIL PROTECTED] + +* sapi/cli/php.1.in: + Fix typo in man page. Bug #30727. Patch by Jakub Vrana + +2004-11-09 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS: + Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob) + +2004-11-09 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_3) + ext/cpdf/cpdf.c + ext/cpdf/cpdf.c: + MFH: Fixed crash inside cpdf_setdash() if called before page init. + +* ext/cpdf/cpdf.c: + Fixed crash inside cpdf_setdash() if called before page init. + 2004-11-08 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_4_3) @@ -12417,7 +12460,7 @@ 2004-03-18 Pierre-Alain Joye [EMAIL PROTECTED] * ext/gd/tests/bug27582_2.phpt: - - Fix the test description and $Id: ChangeLog,v 1.1798 2004/11/09 01:47:08 changelog Exp $ + - Fix the test description and $Id: ChangeLog,v 1.1799 2004/11/10 01:48:53 changelog Exp $ 2004-03-18 Derick Rethans [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/libxml libxml.c php_libxml.h /ext/soap php_sdl.c php_sdl.h soap.c
dmitry Tue Nov 9 03:13:06 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/libxml libxml.c php_libxml.h
/php-src/ext/soap php_sdl.c php_sdl.h soap.c
Log:
Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.117r2=1.1760.2.118ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.117 php-src/NEWS:1.1760.2.118
--- php-src/NEWS:1.1760.2.117 Fri Nov 5 10:08:08 2004
+++ php-src/NEWSTue Nov 9 03:13:01 2004
@@ -45,6 +45,7 @@
(cfield at affinitysolutions dot com)
- Fixed bug #29418 (double free when openssl_csr_new fails).
(Kamesh Jayachandran).
+- Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob)
- Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul
characters). (Moriyoshi)
- Fixed bug #27798 (private / protected variables not exposed by
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.18.2.4r2=1.18.2.5ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.18.2.4
php-src/ext/libxml/libxml.c:1.18.2.5
--- php-src/ext/libxml/libxml.c:1.18.2.4Wed Sep 8 06:16:57 2004
+++ php-src/ext/libxml/libxml.c Tue Nov 9 03:13:04 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.18.2.4 2004/09/08 10:16:57 rrichards Exp $ */
+/* $Id: libxml.c,v 1.18.2.5 2004/11/09 08:13:04 dmitry Exp $ */
#define IS_EXT_MODULE
@@ -243,10 +243,18 @@
int php_libxml_streams_IO_match_wrapper(const char *filename)
{
+ char *resolved_path;
+ int retval;
+
TSRMLS_FETCH();
if (zend_is_executing(TSRMLS_C)) {
- return php_stream_locate_url_wrapper(filename, NULL, 0
TSRMLS_CC) ? 1 : 0;
+ resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+ retval = php_stream_locate_url_wrapper(resolved_path, NULL, 0
TSRMLS_CC) ? 1 : 0;
+ if (resolved_path) {
+ xmlFree(resolved_path);
+ }
+ return retval;
}
return 0;
}
@@ -274,7 +282,7 @@
in xml processing (eg. DTD files) */
wrapper = php_stream_locate_url_wrapper(resolved_path, path_to_open,
ENFORCE_SAFE_MODE TSRMLS_CC);
if (wrapper read_only wrapper-wops-url_stat) {
- if (wrapper-wops-url_stat(wrapper, path_to_open, 0, ssbuf,
NULL TSRMLS_CC) == -1) {
+ if (wrapper-wops-url_stat(wrapper, path_to_open,
PHP_STREAM_URL_STAT_QUIET, ssbuf, NULL TSRMLS_CC) == -1) {
xmlFree(resolved_path);
return NULL;
}
@@ -282,11 +290,9 @@
if (LIBXML(stream_context)) {
context = zend_fetch_resource(LIBXML(stream_context)
TSRMLS_CC, -1, Stream-Context, NULL, 1, php_le_stream_context());
- ret_val = php_stream_open_wrapper_ex(path_to_open, (char
*)mode, ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
- xmlFree(resolved_path);
- return ret_val;
}
- ret_val = php_stream_open_wrapper(path_to_open, (char *)mode,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+
+ ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
xmlFree(resolved_path);
return ret_val;
}
@@ -432,6 +438,15 @@
}
}
+PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC) {
+ zval *oldcontext;
+
+ oldcontext = LIBXML(stream_context);
+ LIBXML(stream_context) = context;
+ return oldcontext;
+
+}
+
PHP_MINIT_FUNCTION(libxml)
{
php_libxml_initialize();
@@ -503,7 +518,6 @@
}
/* }}} */
-
/* {{{ Common functions shared by extensions */
int php_libxml_xmlCheckUTF8(const unsigned char *s)
{
http://cvs.php.net/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.8.2.2r2=1.8.2.3ty=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.8.2.2
php-src/ext/libxml/php_libxml.h:1.8.2.3
--- php-src/ext/libxml/php_libxml.h:1.8.2.2 Wed Sep 8 06:16:57 2004
+++ php-src/ext/libxml/php_libxml.h Tue Nov 9 03:13:04 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.8.2.2 2004/09/08 10:16:57 rrichards Exp $ */
+/* $Id: php_libxml.h,v 1.8.2.3 2004/11/09 08:13:04 dmitry Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -67,6 +67,7 @@
typedef void * (*php_libxml_export_node) (zval *object TSRMLS_DC);
PHP_FUNCTION(libxml_set_streams_context);
+
int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr
node, void *private_data TSRMLS_DC);
int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC);
int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr
docp TSRMLS_DC);
@@ -81,6 +82,7
[PHP-CVS] cvs: php-src /ext/libxml libxml.c php_libxml.h /ext/soap php_sdl.c php_sdl.h soap.c
dmitry Tue Nov 9 03:13:36 2004 EDT
Modified files:
/php-src/ext/libxml libxml.c php_libxml.h
/php-src/ext/soap php_sdl.c php_sdl.h soap.c
Log:
Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob)
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.23r2=1.24ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.23 php-src/ext/libxml/libxml.c:1.24
--- php-src/ext/libxml/libxml.c:1.23Wed Sep 8 06:15:41 2004
+++ php-src/ext/libxml/libxml.c Tue Nov 9 03:13:35 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.23 2004/09/08 10:15:41 rrichards Exp $ */
+/* $Id: libxml.c,v 1.24 2004/11/09 08:13:35 dmitry Exp $ */
#define IS_EXT_MODULE
@@ -243,10 +243,18 @@
int php_libxml_streams_IO_match_wrapper(const char *filename)
{
+ char *resolved_path;
+ int retval;
+
TSRMLS_FETCH();
if (zend_is_executing(TSRMLS_C)) {
- return php_stream_locate_url_wrapper(filename, NULL, 0
TSRMLS_CC) ? 1 : 0;
+ resolved_path = xmlURIUnescapeString(filename, 0, NULL);
+ retval = php_stream_locate_url_wrapper(resolved_path, NULL, 0
TSRMLS_CC) ? 1 : 0;
+ if (resolved_path) {
+ xmlFree(resolved_path);
+ }
+ return retval;
}
return 0;
}
@@ -274,7 +282,7 @@
in xml processing (eg. DTD files) */
wrapper = php_stream_locate_url_wrapper(resolved_path, path_to_open,
ENFORCE_SAFE_MODE TSRMLS_CC);
if (wrapper read_only wrapper-wops-url_stat) {
- if (wrapper-wops-url_stat(wrapper, path_to_open, 0, ssbuf,
NULL TSRMLS_CC) == -1) {
+ if (wrapper-wops-url_stat(wrapper, path_to_open,
PHP_STREAM_URL_STAT_QUIET, ssbuf, NULL TSRMLS_CC) == -1) {
xmlFree(resolved_path);
return NULL;
}
@@ -282,11 +290,9 @@
if (LIBXML(stream_context)) {
context = zend_fetch_resource(LIBXML(stream_context)
TSRMLS_CC, -1, Stream-Context, NULL, 1, php_le_stream_context());
- ret_val = php_stream_open_wrapper_ex(path_to_open, (char
*)mode, ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
- xmlFree(resolved_path);
- return ret_val;
}
- ret_val = php_stream_open_wrapper(path_to_open, (char *)mode,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL);
+
+ ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode,
ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context);
xmlFree(resolved_path);
return ret_val;
}
@@ -432,6 +438,15 @@
}
}
+PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC) {
+ zval *oldcontext;
+
+ oldcontext = LIBXML(stream_context);
+ LIBXML(stream_context) = context;
+ return oldcontext;
+
+}
+
PHP_MINIT_FUNCTION(libxml)
{
php_libxml_initialize();
@@ -503,7 +518,6 @@
}
/* }}} */
-
/* {{{ Common functions shared by extensions */
int php_libxml_xmlCheckUTF8(const unsigned char *s)
{
http://cvs.php.net/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.10r2=1.11ty=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.10
php-src/ext/libxml/php_libxml.h:1.11
--- php-src/ext/libxml/php_libxml.h:1.10Wed Sep 8 06:15:41 2004
+++ php-src/ext/libxml/php_libxml.h Tue Nov 9 03:13:35 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_libxml.h,v 1.10 2004/09/08 10:15:41 rrichards Exp $ */
+/* $Id: php_libxml.h,v 1.11 2004/11/09 08:13:35 dmitry Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -67,6 +67,7 @@
typedef void * (*php_libxml_export_node) (zval *object TSRMLS_DC);
PHP_FUNCTION(libxml_set_streams_context);
+
int php_libxml_increment_node_ptr(php_libxml_node_object *object, xmlNodePtr
node, void *private_data TSRMLS_DC);
int php_libxml_decrement_node_ptr(php_libxml_node_object *object TSRMLS_DC);
int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr
docp TSRMLS_DC);
@@ -81,6 +82,7 @@
void php_libxml_ctx_warning(void *ctx, const char *msg, ...);
void php_libxml_ctx_error(void *ctx, const char *msg, ...);
PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s);
+PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC);
#endif /* HAVE_LIBXML */
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.75r2=1.76ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.75 php-src/ext/soap/php_sdl.c:1.76
--- php-src/ext/soap/php_sdl.c:1.75 Sun Sep 26 17:45:17 2004
+++ php-src/ext/soap/php_sdl.c Tue Nov 9 03:13:35 2004
@@ -17,9 +17,10 @@
| Dmitry Stogov [EMAIL PROTECTED] |
[PHP-CVS] cvs: php-src /sapi/cli php.1.in
fmk Tue Nov 9 10:05:21 2004 EDT Modified files: /php-src/sapi/cli php.1.in Log: Fix typo in man page. Bug #30727. Patch by Jakub Vrana http://cvs.php.net/diff.php/php-src/sapi/cli/php.1.in?r1=1.7r2=1.8ty=u Index: php-src/sapi/cli/php.1.in diff -u php-src/sapi/cli/php.1.in:1.7 php-src/sapi/cli/php.1.in:1.8 --- php-src/sapi/cli/php.1.in:1.7 Sun May 2 05:14:02 2004 +++ php-src/sapi/cli/php.1.in Tue Nov 9 10:05:20 2004 @@ -14,7 +14,7 @@ ./| Author: Marcus Boerger [EMAIL PROTECTED] | ./+--+ ./ -./ $Id: php.1.in,v 1.7 2004/05/02 09:14:02 helly Exp $ +./ $Id: php.1.in,v 1.8 2004/11/09 15:05:20 fmk Exp $ ./ .TH PHP 1 Feb 2003 The PHP Group Scripting Language .SH NAME @@ -380,7 +380,7 @@ .LP This source file is subject to version 3.0 of the PHP license, that is bundled with this package in the file LICENSE, and is -available at through the world-wide-web at +available through the world-wide-web at .PD 0 .P .B http://www.php.net/license/3_0.txt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard config.m4
jorton Tue Nov 9 10:58:17 2004 EDT
Modified files:
/php-src/ext/standard config.m4
Log:
Make the rounding fuzz check work again with gcc 3.3 and later,
fixing the bug24142 test.
http://cvs.php.net/diff.php/php-src/ext/standard/config.m4?r1=1.76r2=1.77ty=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.76 php-src/ext/standard/config.m4:1.77
--- php-src/ext/standard/config.m4:1.76 Tue Sep 28 16:42:56 2004
+++ php-src/ext/standard/config.m4 Tue Nov 9 10:58:16 2004
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.76 2004/09/28 20:42:56 sniper Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.77 2004/11/09 15:58:16 jorton Exp $ -*- autoconf -*-
divert(3)dnl
@@ -275,8 +275,12 @@
AC_MSG_CHECKING([whether rounding works as expected])
AC_TRY_RUN([
#include math.h
+ /* keep this out-of-line to prevent use of gcc inline floor() */
+ double somefn(double n) {
+return floor(n*pow(10,2) + 0.5);
+ }
int main() {
-return floor(0.045*pow(10,2) + 0.5)/10.0 != 0.5;
+return somefn(0.045)/10.0 != 0.5;
}
],[
PHP_ROUND_FUZZ=0.5
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/recode config9.m4
jorton Tue Nov 9 11:11:13 2004 EDT Modified files: /php-src/ext/recode config9.m4 Log: Fix --with-recode since PHP_YAZ is never defined. http://cvs.php.net/diff.php/php-src/ext/recode/config9.m4?r1=1.1r2=1.2ty=u Index: php-src/ext/recode/config9.m4 diff -u php-src/ext/recode/config9.m4:1.1 php-src/ext/recode/config9.m4:1.2 --- php-src/ext/recode/config9.m4:1.1 Sun Feb 15 12:54:19 2004 +++ php-src/ext/recode/config9.m4 Tue Nov 9 11:11:13 2004 @@ -1,12 +1,11 @@ dnl -dnl $Id: config9.m4,v 1.1 2004/02/15 17:54:19 sniper Exp $ +dnl $Id: config9.m4,v 1.2 2004/11/09 16:11:13 jorton Exp $ dnl dnl Check for extensions with which Recode can not work if test $PHP_RECODE != no; then test $PHP_IMAP != no recode_conflict=$recode_conflict imap test $PHP_MYSQL != no recode_conflict=$recode_conflict mysql - test $PHP_YAZ != no recode_conflict=$recode_conflict yaz if test -n $recode_conflict; then AC_MSG_ERROR([recode extension can not be configured together with:$recode_conflict]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard config.m4
On Tue, 9 Nov 2004, Joe Orton wrote: jortonTue Nov 9 10:58:17 2004 EDT Modified files: /php-src/ext/standard config.m4 Log: Make the rounding fuzz check work again with gcc 3.3 and later, fixing the bug24142 test. Doesn't this need to be fixed in PHP_5_0 and PHP_4_3 either? And can it have something to do with bug #30729? regards, 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/exif exif.c
iliaa Tue Nov 9 20:43:08 2004 EDT
Modified files:
/php-src/ext/exif exif.c
Log:
Fixed possible overflow.
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.163r2=1.164ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.163 php-src/ext/exif/exif.c:1.164
--- php-src/ext/exif/exif.c:1.163 Thu Nov 4 15:13:30 2004
+++ php-src/ext/exif/exif.c Tue Nov 9 20:43:04 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.163 2004/11/04 20:13:30 helly Exp $ */
+/* $Id: exif.c,v 1.164 2004/11/10 01:43:04 iliaa Exp $ */
/* ToDos
*
@@ -111,7 +111,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.163 2004/11/04 20:13:30 helly Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.164 2004/11/10 01:43:04 iliaa Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3776,7 +3776,7 @@
}
}
for (i=0; iSECTION_COUNT; i++) {
- sprintf(tmp, ,%s,, exif_get_sectionname(i));
+ snprintf(tmp, sizeof(tmp), ,%s,,
exif_get_sectionname(i));
if (strstr(sections_str, tmp)) {
sections_needed |= 1i;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/exif exif.c
iliaa Tue Nov 9 20:44:59 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/exif exif.c
Log:
MFH: Fixed possible overflow.
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.118.2.28r2=1.118.2.29ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.118.2.28 php-src/ext/exif/exif.c:1.118.2.29
--- php-src/ext/exif/exif.c:1.118.2.28 Thu Nov 4 15:17:24 2004
+++ php-src/ext/exif/exif.c Tue Nov 9 20:44:58 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.118.2.28 2004/11/04 20:17:24 helly Exp $ */
+/* $Id: exif.c,v 1.118.2.29 2004/11/10 01:44:58 iliaa Exp $ */
/* ToDos
*
@@ -99,7 +99,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.28 2004/11/04 20:17:24 helly
Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.118.2.29 2004/11/10 01:44:58 iliaa
Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3750,7 +3750,7 @@
}
}
for (i=0; iSECTION_COUNT; i++) {
- sprintf(tmp, ,%s,, exif_get_sectionname(i));
+ snprintf(tmp, sizeof(tmp), ,%s,,
exif_get_sectionname(i));
if (strstr(sections_str, tmp)) {
sections_needed |= 1i;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
