[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue May 22 01:31:03 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2695r2=1.2696diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2695 php-src/ChangeLog:1.2696 --- php-src/ChangeLog:1.2695Mon May 21 01:31:05 2007 +++ php-src/ChangeLog Tue May 22 01:31:03 2007 @@ -1,3 +1,71 @@ +2007-05-21 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + + Fixed typos + +2007-05-21 Michael Wallner [EMAIL PROTECTED] + +* ext/curl/config.m4: + MFB: first check the SSL lib string in libcurl and then the header + +* (PHP_5_2) + ext/curl/config.m4: + - first check the SSL lib string in libcurl and then the header + +2007-05-21 Dmitry Stogov [EMAIL PROTECTED] + +* ext/soap/php_sdl.c + ext/soap/php_sdl.c + ext/soap/tests/bugs/bug41337_2.phpt + ext/soap/tests/bugs/bug41337_2.wsdl + ext/soap/tests/bugs/bug41337_2_1.wsdl: + Fixed bug #41337 WSDL parsing doesn't ignore non soap bindings + +* ext/soap/tests/bugs/bug41337_2.phpt + ext/soap/tests/bugs/bug41337_2.phpt + ext/soap/tests/bugs/bug41337_2.wsdl + ext/soap/tests/bugs/bug41337_2.wsdl + ext/soap/tests/bugs/bug41337_2_1.wsdl + ext/soap/tests/bugs/bug41337_2_1.wsdl: + + file bug41337_2.phpt was initially added on branch PHP_5_2. + +2007-05-21 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/dba/config.m4: + MFH: fix #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS) + +* ext/dba/config.m4: + fix #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS) + +2007-05-21 Dmitry Stogov [EMAIL PROTECTED] + +* sapi/cgi/cgi_main.c + sapi/cgi/cgi_main.c + sapi/cgi/fastcgi.c + sapi/cgi/fastcgi.c + sapi/cgi/fastcgi.h + sapi/cgi/fastcgi.h: + Fixed crash on php -b 1234 -unknown-option + +* configure.in + configure.in + sapi/cgi/config9.m4: + libfcgi cleanup (Andrei Nigmatulin) + +2007-05-21 Antony Dovgal [EMAIL PROTECTED] + +* ZendEngine2/zend_operators.c: + use zend_make_string_zval() + thanks Matt! + +* ZendEngine2/zend_execute_API.c: + check if fci-object_pp points to NULL + 2007-05-20 Marcus Boerger [EMAIL PROTECTED] * .gdbinit:
[PHP-CVS] cvs: php-src(PHP_5_2) / configure.in /sapi/cgi config9.m4
dmitry Mon May 21 08:47:51 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcconfigure.in /php-src/sapi/cgi config9.m4 Log: libfcgi cleanup (Andrei Nigmatulin) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.50r2=1.579.2.52.2.51diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.50 php-src/configure.in:1.579.2.52.2.51 --- php-src/configure.in:1.579.2.52.2.50Thu May 3 01:16:50 2007 +++ php-src/configure.inMon May 21 08:47:51 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.52.2.50 2007/05/03 01:16:50 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.52.2.51 2007/05/21 08:47:51 dmitry Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -260,12 +260,6 @@ PTHREADS_FLAGS fi -if test $PHP_ENABLE_FASTCGI = yes; then - PHP_CONFIGURE_PART(Running FastCGI checks) - sinclude(sapi/cgi/libfcgi/acinclude.m4) - sinclude(sapi/cgi/libfcgi/libfcgi.m4) -fi - divert(3) dnl ## In diversion 3 we check for compile-time options to the PHP http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/config9.m4?r1=1.17.2.2.2.2r2=1.17.2.2.2.3diff_format=u Index: php-src/sapi/cgi/config9.m4 diff -u php-src/sapi/cgi/config9.m4:1.17.2.2.2.2 php-src/sapi/cgi/config9.m4:1.17.2.2.2.3 --- php-src/sapi/cgi/config9.m4:1.17.2.2.2.2Tue Feb 20 20:11:11 2007 +++ php-src/sapi/cgi/config9.m4 Mon May 21 08:47:51 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config9.m4,v 1.17.2.2.2.2 2007/02/20 20:11:11 tony2001 Exp $ +dnl $Id: config9.m4,v 1.17.2.2.2.3 2007/05/21 08:47:51 dmitry Exp $ dnl AC_ARG_ENABLE(cgi, @@ -98,14 +98,11 @@ if test $PHP_ENABLE_FASTCGI = yes; then PHP_FASTCGI=1 PHP_FCGI_FILES=fastcgi.c - PHP_FCGI_STATIC=1 else PHP_FASTCGI=0 PHP_FCGI_FILES= - PHP_FCGI_STATIC=0 fi AC_DEFINE_UNQUOTED(PHP_FASTCGI, $PHP_FASTCGI, [ ]) -AC_DEFINE_UNQUOTED(PHP_FCGI_STATIC, $PHP_FCGI_STATIC, [ ]) AC_MSG_RESULT($PHP_ENABLE_FASTCGI) INSTALL_IT=@echo \Installing PHP CGI into: \$(INSTALL_ROOT)\$(bindir)/\; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / configure.in
dmitry Mon May 21 08:48:13 2007 UTC Modified files: /php-srcconfigure.in Log: libfcgi cleanup (Andrei Nigmatulin) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.624r2=1.625diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.624 php-src/configure.in:1.625 --- php-src/configure.in:1.624 Sat Mar 3 20:41:11 2007 +++ php-src/configure.inMon May 21 08:48:13 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.624 2007/03/03 20:41:11 helly Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.625 2007/05/21 08:48:13 dmitry Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -258,12 +258,6 @@ PTHREADS_FLAGS fi -if test $PHP_ENABLE_FASTCGI = yes; then - PHP_CONFIGURE_PART(Running FastCGI checks) - sinclude(sapi/cgi/libfcgi/acinclude.m4) - sinclude(sapi/cgi/libfcgi/libfcgi.m4) -fi - divert(3) dnl ## In diversion 3 we check for compile-time options to the PHP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c fastcgi.c fastcgi.h
dmitry Mon May 21 09:08:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c fastcgi.c fastcgi.h
Log:
Fixed crash on php -b 1234 -unknown-option
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.38r2=1.267.2.15.2.39diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.38
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.39
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.38 Sun May 20 15:56:09 2007
+++ php-src/sapi/cgi/cgi_main.c Mon May 21 09:08:12 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.38 2007/05/20 15:56:09 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.39 2007/05/21 09:08:12 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -1429,6 +1429,9 @@
switch (c) {
case 'h':
case '?':
+#if PHP_FASTCGI
+ fcgi_shutdown();
+#endif
no_headers = 1;
php_output_startup();
php_output_activate(TSRMLS_C);
@@ -1823,6 +1826,7 @@
}
/* end of fastcgi loop */
}
+ fcgi_shutdown();
#endif
if (cgi_sapi_module.php_ini_path_override) {
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.25r2=1.4.2.13.2.26diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.25
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.26
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.25Thu May 10 15:21:02 2007
+++ php-src/sapi/cgi/fastcgi.c Mon May 21 09:08:13 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.25 2007/05/10 15:21:02 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.26 2007/05/21 09:08:13 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -255,6 +255,11 @@
}
}
+void fcgi_shutdown(void)
+{
+ is_fastcgi = 0;
+}
+
#ifdef _WIN32
/* Do some black magic with the NT security API.
* We prepare a DACL (Discretionary Access Control List) so that
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.2.2.4.2.4r2=1.2.2.4.2.5diff_format=u
Index: php-src/sapi/cgi/fastcgi.h
diff -u php-src/sapi/cgi/fastcgi.h:1.2.2.4.2.4
php-src/sapi/cgi/fastcgi.h:1.2.2.4.2.5
--- php-src/sapi/cgi/fastcgi.h:1.2.2.4.2.4 Wed Mar 28 15:39:22 2007
+++ php-src/sapi/cgi/fastcgi.h Mon May 21 09:08:13 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.h,v 1.2.2.4.2.4 2007/03/28 15:39:22 dmitry Exp $ */
+/* $Id: fastcgi.h,v 1.2.2.4.2.5 2007/05/21 09:08:13 dmitry Exp $ */
/* FastCGI protocol */
@@ -112,6 +112,7 @@
} fcgi_request;
int fcgi_init(void);
+void fcgi_shutdown(void);
int fcgi_is_fastcgi(void);
int fcgi_in_shutdown(void);
int fcgi_listen(const char *path, int backlog);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c fastcgi.c fastcgi.h
dmitry Mon May 21 09:08:25 2007 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c fastcgi.c fastcgi.h
Log:
Fixed crash on php -b 1234 -unknown-option
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.321r2=1.322diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.321 php-src/sapi/cgi/cgi_main.c:1.322
--- php-src/sapi/cgi/cgi_main.c:1.321 Tue May 15 08:17:20 2007
+++ php-src/sapi/cgi/cgi_main.c Mon May 21 09:08:25 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.321 2007/05/15 08:17:20 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.322 2007/05/21 09:08:25 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -1369,6 +1369,7 @@
switch (c) {
case 'h':
case '?':
+ fcgi_shutdown();
no_headers = 1;
php_output_tearup();
SG(headers_sent) = 1;
@@ -1735,6 +1736,7 @@
}
/* end of fastcgi loop */
}
+ fcgi_shutdown();
if (cgi_sapi_module.php_ini_path_override) {
free(cgi_sapi_module.php_ini_path_override);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.38r2=1.39diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.38 php-src/sapi/cgi/fastcgi.c:1.39
--- php-src/sapi/cgi/fastcgi.c:1.38 Thu May 10 15:22:15 2007
+++ php-src/sapi/cgi/fastcgi.c Mon May 21 09:08:25 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.c,v 1.38 2007/05/10 15:22:15 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.39 2007/05/21 09:08:25 dmitry Exp $ */
#include php.h
#include fastcgi.h
@@ -177,6 +177,11 @@
return in_shutdown;
}
+void fcgi_shutdown(void)
+{
+ is_fastcgi = 0;
+}
+
int fcgi_init(void)
{
if (!is_initialized) {
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.8r2=1.9diff_format=u
Index: php-src/sapi/cgi/fastcgi.h
diff -u php-src/sapi/cgi/fastcgi.h:1.8 php-src/sapi/cgi/fastcgi.h:1.9
--- php-src/sapi/cgi/fastcgi.h:1.8 Wed Mar 28 15:39:35 2007
+++ php-src/sapi/cgi/fastcgi.h Mon May 21 09:08:25 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fastcgi.h,v 1.8 2007/03/28 15:39:35 dmitry Exp $ */
+/* $Id: fastcgi.h,v 1.9 2007/05/21 09:08:25 dmitry Exp $ */
/* FastCGI protocol */
@@ -112,6 +112,7 @@
} fcgi_request;
int fcgi_init(void);
+void fcgi_shutdown(void);
int fcgi_is_fastcgi(void);
int fcgi_in_shutdown(void);
int fcgi_listen(const char *path, int backlog);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/dba config.m4
tony2001Mon May 21 11:38:53 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/dbaconfig.m4 Log: MFH: fix #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.724r2=1.2027.2.547.2.725diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.724 php-src/NEWS:1.2027.2.547.2.725 --- php-src/NEWS:1.2027.2.547.2.724 Sat May 19 22:05:08 2007 +++ php-src/NEWSMon May 21 11:38:53 2007 @@ -19,6 +19,8 @@ - Fixed altering $this via argument named this. (Dmitry) - Fixed PHP CLI to use the php.ini from the binary location. (Hannes) - Fixed segfault in strripos(). (Tony, Joxean Koret) +- Fixed bug #41455 (ext/dba/config.m4 pollutes global $LIBS and $LDFLAGS). + (mmarek at suse dot cz, Tony) - Fixed bug #41430 (Fatal error with negative values of maxlen parameter of file_get_contents()). (Tony) - fixed bug #41423 (PHP assumes wrongly that certain ciphers are enabled in http://cvs.php.net/viewvc.cgi/php-src/ext/dba/config.m4?r1=1.70.2.2.2.4r2=1.70.2.2.2.5diff_format=u Index: php-src/ext/dba/config.m4 diff -u php-src/ext/dba/config.m4:1.70.2.2.2.4 php-src/ext/dba/config.m4:1.70.2.2.2.5 --- php-src/ext/dba/config.m4:1.70.2.2.2.4 Tue Dec 5 17:54:52 2006 +++ php-src/ext/dba/config.m4 Mon May 21 11:38:53 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.70.2.2.2.4 2006/12/05 17:54:52 iliaa Exp $ +dnl $Id: config.m4,v 1.70.2.2.2.5 2007/05/21 11:38:53 tony2001 Exp $ dnl dnl Suppose we need FlatFile if no support or only CDB is used. @@ -172,6 +172,7 @@ AC_DEFUN([PHP_DBA_DB_CHECK],[ for LIB in $2; do if test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.a || test -f $THIS_PREFIX/$PHP_LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then + lib_found=; PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$PHP_LIBDIR, -l$LIB,[ AC_TRY_LINK([ #include $THIS_INCLUDE @@ -185,10 +186,14 @@ #endif ],[ THIS_LIBS=$LIB -break +lib_found=1 ]) ]) ]) + if test -n $lib_found; then +lib_found=; +break; + fi fi done if test -z $THIS_LIBS; then -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c /ext/soap/tests/bugs bug41337_2.phpt bug41337_2.wsdl bug41337_2_1.wsdl
dmitry Mon May 21 13:13:51 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug41337_2.phpt bug41337_2.wsdl
bug41337_2_1.wsdl
Modified files:
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #41337 WSDL parsing doesn't ignore non soap bindings
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.8r2=1.88.2.12.2.9diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.8
php-src/ext/soap/php_sdl.c:1.88.2.12.2.9
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.8Thu May 10 14:58:17 2007
+++ php-src/ext/soap/php_sdl.c Mon May 21 13:13:50 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.8 2007/05/10 14:58:17 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.9 2007/05/21 13:13:50 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -717,7 +717,7 @@
trav2 = trav2-next;
}
if (!address) {
- if (has_soap_port || trav-next) {
+ if (has_soap_port || trav-next || i
n-1) {
efree(tmpbinding);
trav = trav-next;
continue;
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug41337_2.phpt
+++ php-src/ext/soap/tests/bugs/bug41337_2.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug41337_2.wsdl
+++ php-src/ext/soap/tests/bugs/bug41337_2.wsdl
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl
+++ php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl
--
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_sdl.c /ext/soap/tests/bugs bug41337_2.phpt bug41337_2.wsdl bug41337_2_1.wsdl
dmitry Mon May 21 13:14:02 2007 UTC
Modified files:
/php-src/ext/soap php_sdl.c
/php-src/ext/soap/tests/bugsbug41337_2.phpt bug41337_2.wsdl
bug41337_2_1.wsdl
Log:
Fixed bug #41337 WSDL parsing doesn't ignore non soap bindings
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.108r2=1.109diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.108 php-src/ext/soap/php_sdl.c:1.109
--- php-src/ext/soap/php_sdl.c:1.108Thu May 10 14:58:31 2007
+++ php-src/ext/soap/php_sdl.c Mon May 21 13:14:02 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.108 2007/05/10 14:58:31 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.109 2007/05/21 13:14:02 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -717,7 +717,7 @@
trav2 = trav2-next;
}
if (!address) {
- if (has_soap_port || trav-next) {
+ if (has_soap_port || trav-next || i
n-1) {
efree(tmpbinding);
trav = trav-next;
continue;
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug41337_2.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug41337_2.phpt:1.2
--- /dev/null Mon May 21 13:14:02 2007
+++ php-src/ext/soap/tests/bugs/bug41337_2.phpt Mon May 21 13:14:02 2007
@@ -0,0 +1,12 @@
+--TEST--
+Bug #41337 (WSDL parsing doesn't ignore non soap bindings)
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+ini_set(soap.wsdl_cache_enabled,0);
+$client = new SoapClient(dirname(__FILE__)./bug41337_2.wsdl);
+echo ok\n;
+?
+--EXPECT--
+ok
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2.wsdl?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug41337_2.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/bug41337_2.wsdl:1.2
--- /dev/null Mon May 21 13:14:02 2007
+++ php-src/ext/soap/tests/bugs/bug41337_2.wsdl Mon May 21 13:14:02 2007
@@ -0,0 +1,36 @@
+?xml version=1.0 ?
+definitions
+xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
+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/;
+xmlns:si=http://soapinterop.org/xsd;
+xmlns:tns=http://linuxsrv.home/~dmitry/soap/test.wsdl;
+xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/;
+xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/;
+xmlns=http://schemas.xmlsoap.org/wsdl/;
+targetNamespace=http://linuxsrv.home/~dmitry/soap/test.wsdl;
+
+ import namespace=http://linuxsrv.home/~dmitry/soap/test.wsdl;
+ location=bug41337_2_1.wsdl /
+
+ binding name=TestServiceBinding type=tns:TestServicePortType
+soap:binding style=rpc transport=http://schemas.xmlsoap.org/soap/http;
/
+operation name=Add
+ soap:operation soapAction=Add style=rpc /
+ input
+soap:body use=encoded
encodingStyle=http://schemas.xmlsoap.org/soap/encoding/; /
+ /input
+ output
+soap:body use=encoded
encodingStyle=http://schemas.xmlsoap.org/soap/encoding/; /
+ /output
+/operation
+ /binding
+
+ service name=TestService
+port name=TestServicePort binding=tns:TestServiceBinding
+ soap:address
location=http://linuxsrv.home/~dmitry/soap/soap_server.php; /
+/port
+ /service
+
+/definitions
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl:1.2
--- /dev/null Mon May 21 13:14:02 2007
+++ php-src/ext/soap/tests/bugs/bug41337_2_1.wsdl Mon May 21 13:14:02 2007
@@ -0,0 +1,47 @@
+?xml version=1.0 ?
+definitions
+xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
+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/;
+xmlns:si=http://soapinterop.org/xsd;
+xmlns:tns=http://linuxsrv.home/~dmitry/soap/test.wsdl;
+xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/;
+xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/;
+xmlns=http://schemas.xmlsoap.org/wsdl/;
+targetNamespace=http://linuxsrv.home/~dmitry/soap/test.wsdl;
+
+ types
+xsd:schema targetNamespace=http://linuxsrv.home/~dmitry/soap/test.wsdl;
+ xsd:import namespace=http://schemas.xmlsoap.org/soap/encoding/; /
+ xsd:import
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/curl config.m4
mikeMon May 21 13:32:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl config.m4
Log:
- first check the SSL lib string in libcurl and then the header
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.28.2.3.2.5r2=1.28.2.3.2.6diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.28.2.3.2.5
php-src/ext/curl/config.m4:1.28.2.3.2.6
--- php-src/ext/curl/config.m4:1.28.2.3.2.5 Sat May 19 19:36:11 2007
+++ php-src/ext/curl/config.m4 Mon May 21 13:32:35 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28.2.3.2.5 2007/05/19 19:36:11 mike Exp $
+dnl $Id: config.m4,v 1.28.2.3.2.6 2007/05/21 13:32:35 mike Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -60,50 +60,51 @@
save_LDFLAGS=$LDFALGS
LDFLAGS=`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR
- AC_CHECK_HEADER([openssl/crypto.h], [
-AC_MSG_CHECKING([for openssl support in libcurl])
-AC_TRY_RUN([
- #include curl/curl.h
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
- }
- return 1;
+ AC_PROG_CPP
+ AC_MSG_CHECKING([for openssl support in libcurl])
+ AC_TRY_RUN([
+#include curl/curl.h
+int main(int argc, char *argv[]) {
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+ if (data data-ssl_version *data-ssl_version) {
+ const char *ptr = data-ssl_version;
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
}
-],[
- AC_MSG_RESULT([yes])
+ return 1;
+}
+ ],[
+AC_MSG_RESULT([yes])
+AC_CHECK_HEADER([openssl/crypto.h], [
AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
-], [
- AC_MSG_RESULT([no])
-], [
- AC_MSG_RESULT([no])
])
+ ], [
+AC_MSG_RESULT([no])
+ ], [
+AC_MSG_RESULT([no])
])
- AC_CHECK_HEADER([gcrypt.h], [
-AC_MSG_CHECKING([for gnutls support in libcurl])
-AC_TRY_RUN([
- #include curl/curl.h
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
- }
- return 1;
+ AC_MSG_CHECKING([for gnutls support in libcurl])
+ AC_TRY_RUN([
+#include curl/curl.h
+int main(int argc, char *argv[]) {
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+ if (data data-ssl_version *data-ssl_version) {
+ const char *ptr = data-ssl_version;
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
}
-], [
- AC_MSG_RESULT([yes])
+ return 1;
+}
+ ], [
+AC_MSG_RESULT([yes])
+AC_CHECK_HEADER([gcrypt.h], [
AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
-], [
- AC_MSG_RESULT([no])
-], [
- AC_MSG_RESULT([no])
])
+ ], [
+AC_MSG_RESULT([no])
+ ], [
+AC_MSG_RESULT([no])
])
CFLAGS=$save_CFLAGS
--
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
mikeMon May 21 13:34:39 2007 UTC
Modified files:
/php-src/ext/curl config.m4
Log:
MFB: first check the SSL lib string in libcurl and then the header
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.37r2=1.38diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.37 php-src/ext/curl/config.m4:1.38
--- php-src/ext/curl/config.m4:1.37 Sat May 19 19:36:35 2007
+++ php-src/ext/curl/config.m4 Mon May 21 13:34:39 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.37 2007/05/19 19:36:35 mike Exp $
+dnl $Id: config.m4,v 1.38 2007/05/21 13:34:39 mike Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -60,50 +60,51 @@
save_LDFLAGS=$LDFALGS
LDFLAGS=`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR
- AC_CHECK_HEADER([openssl/crypto.h], [
-AC_MSG_CHECKING([for openssl support in libcurl])
-AC_TRY_RUN([
- #include curl/curl.h
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
- }
- return 1;
+ AC_PROG_CPP
+ AC_MSG_CHECKING([for openssl support in libcurl])
+ AC_TRY_RUN([
+#include curl/curl.h
+int main(int argc, char *argv[]) {
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+ if (data data-ssl_version *data-ssl_version) {
+ const char *ptr = data-ssl_version;
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
}
-],[
- AC_MSG_RESULT([yes])
+ return 1;
+}
+ ],[
+AC_MSG_RESULT([yes])
+AC_CHECK_HEADER([openssl/crypto.h], [
AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
-], [
- AC_MSG_RESULT([no])
-], [
- AC_MSG_RESULT([no])
])
+ ], [
+AC_MSG_RESULT([no])
+ ], [
+AC_MSG_RESULT([no])
])
- AC_CHECK_HEADER([gcrypt.h], [
-AC_MSG_CHECKING([for gnutls support in libcurl])
-AC_TRY_RUN([
- #include curl/curl.h
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
- }
- return 1;
+ AC_MSG_CHECKING([for gnutls support in libcurl])
+ AC_TRY_RUN([
+#include curl/curl.h
+int main(int argc, char *argv[]) {
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+ if (data data-ssl_version *data-ssl_version) {
+ const char *ptr = data-ssl_version;
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
}
-], [
- AC_MSG_RESULT([yes])
+ return 1;
+}
+ ], [
+AC_MSG_RESULT([yes])
+AC_CHECK_HEADER([gcrypt.h], [
AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
-], [
- AC_MSG_RESULT([no])
-], [
- AC_MSG_RESULT([no])
])
+ ], [
+AC_MSG_RESULT([no])
+ ], [
+AC_MSG_RESULT([no])
])
CFLAGS=$save_CFLAGS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
iliaa Mon May 21 16:50:03 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: Fixed typos http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.725r2=1.2027.2.547.2.726diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.725 php-src/NEWS:1.2027.2.547.2.726 --- php-src/NEWS:1.2027.2.547.2.725 Mon May 21 11:38:53 2007 +++ php-src/NEWSMon May 21 16:50:03 2007 @@ -35,7 +35,7 @@ (Scott) - Fixed bug #41378 (fastcgi protocol lacks support for Reason-Phrase in Status: header). (anight at eyelinkmedia dot com, Dmitry) -- Fixed bug #41374 (wholetext concats values of wrong nodes). (Rob) +- Fixed bug #41374 (whole text concats values of wrong nodes). (Rob) - Fixed bug #41358 (configure cannot determine libcurl's SSL lib as of v7.16.2) (Mike) - Fixed bug #41353 (crash in openssl_pkcs12_read() on invalid input). (Ilia) @@ -64,7 +64,7 @@ - Fixed bug #41097 (ext/soap returning associative array as indexed without using WSDL). (Dmitry) - Fixed bug #41004 (minOccurs=0 and null class member variable). (Dmitry) -- Fixed bug #39542 (Behaviour of require/include different to 5.2.0). +- Fixed bug #39542 (Behavior of require/include different to 5.2.0). (Dmitry) 03 May 2007, PHP 5.2.2 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / loginfo
derick Tue May 22 05:41:00 2007 UTC
Modified files:
/CVSROOTloginfo
Log:
- Redirect CVSROOT/pear commits to pear-cvs@ and pear-core@ as request
by Mr President.
http://cvs.php.net/viewvc.cgi/CVSROOT/loginfo?r1=1.118r2=1.119diff_format=u
Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.118 CVSROOT/loginfo:1.119
--- CVSROOT/loginfo:1.118 Tue Feb 13 02:11:49 2007
+++ CVSROOT/loginfo Tue May 22 05:41:00 2007
@@ -1,5 +1,5 @@
#
-#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.118 2007/02/13 02:11:49
derick Exp $
+#ident @(#)cvs/examples:$Name: $:$Id: loginfo,v 1.119 2007/05/22 05:41:00
derick Exp $
#
# The loginfo file is used to control where cvs commit log information
# is sent. The first entry on a line is a regular expression which is tested
@@ -97,7 +97,10 @@
^pearweb$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED],[EMAIL PROTECTED]
$USER %{sVv}
^pear/installphars $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]
$USER %{sVv}
^pear $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
-^pecl $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
+^CVSROOT/pear $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED],[EMAIL PROTECTED]
$USER %{sVv}
+
+# PECL
+^pecl$CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED]$USER %{sVv}
# QA website
^qaweb $CVSROOT/CVSROOT/loginfo.pl [EMAIL PROTECTED] $USER %{sVv}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
