[PHP-CVS] cvs: CVSROOT / avail
derick Tue Sep 14 02:49:22 2004 EDT Modified files: /CVSROOTavail Log: - Fixed karma for Tadashi. http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.904&r2=1.905&ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.904 CVSROOT/avail:1.905 --- CVSROOT/avail:1.904 Wed Sep 8 04:26:45 2004 +++ CVSROOT/avail Tue Sep 14 02:49:21 2004 @@ -63,7 +63,9 @@ # Some people get access to the peardoc avail|sroebke,thierry_bo,schst,mcgyver5,sousk,gurugeek,norbert_m,didou,poz,romain,haruki,jurbo,kusor,cipri,yannick,radzaw,adamg,justinpatrin,peterhuewe,ssttoo|peardoc avail|elf|peardoc/ja -avail|elf|phpdoc/ja + +# Some people get only access to specific languages for phpdoc +avail|elf|phpdoc-ja # access to the newly cut pecl website etc avail|pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon|peclweb,pecl -- 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_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
On Mon, 13 Sep 2004, Marcus Boerger wrote: > Hello Rasmus, Hallo Rainer, > > Monday, September 13, 2004, 9:44:09 PM, you wrote: > > > On Mon, 13 Sep 2004, Rainer Schaaf wrote: > >> > There is also the issue that the new pdflib license appears to be rather > >> > evil. So maybe we should stick with the older version of the library. > >> > >> The new PDFlib-Lite license appeared with PDFlib 5. > > > Yes, I realize I am behind. I still use pdflib4 for pres2 stuff. Having > > decent support for pdflib v4 is important as far as I am concerned since > > that was the last version that people can use freely. > > Can't pres2 work with cpdflib? Or would it be an option to bundle pfdlib v4 > with php? Bundling -> no! And rewriting pres2 to work with something else is suboptimal too, as it is working fine with version 4. 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(PHP_4_3) / NEWS
rasmus Tue Sep 14 02:10:04 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS Log: Stefano did the real work tracking this one down http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.725&r2=1.1247.2.726&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.725 php-src/NEWS:1.1247.2.726 --- php-src/NEWS:1.1247.2.725 Tue Sep 14 00:28:46 2004 +++ php-src/NEWSTue Sep 14 02:10:02 2004 @@ -1,7 +1,7 @@ PHP 4 NEWS ||| 14 Sep 2004, Version 4.3.9RC3 -- GPC input processing fixes (Rasmus, Stefan) +- GPC input processing fixes (Stefano Di Paola, Rasmus, Stefan) 31 Aug 2004, Version 4.3.9RC2 - Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory -- 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) / configure.in /main php_version.h
iliaa Tue Sep 14 00:33:09 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcconfigure.in /php-src/main php_version.h Log: Back to dev. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.124&r2=1.396.2.125&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.124 php-src/configure.in:1.396.2.125 --- php-src/configure.in:1.396.2.124Tue Sep 14 00:28:46 2004 +++ php-src/configure.inTue Sep 14 00:33:09 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.124 2004/09/14 04:28:46 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.125 2004/09/14 04:33:09 iliaa Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=9 -EXTRA_VERSION="RC3" +EXTRA_VERSION="RC4-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.66&r2=1.66.2.67&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.66 php-src/main/php_version.h:1.66.2.67 --- php-src/main/php_version.h:1.66.2.66Tue Sep 14 00:28:47 2004 +++ php-src/main/php_version.h Tue Sep 14 00:33:09 2004 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION "RC3" -#define PHP_VERSION "4.3.9RC3" +#define PHP_EXTRA_VERSION "RC4-dev" +#define PHP_VERSION "4.3.9RC4-dev" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) / NEWS configure.in /main php_version.h
iliaa Tue Sep 14 00:28:47 2004 EDT Modified files: (Branch: PHP_4_3) /php-srcNEWS configure.in /php-src/main php_version.h Log: 4.3.9RC3 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.724&r2=1.1247.2.725&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.724 php-src/NEWS:1.1247.2.725 --- php-src/NEWS:1.1247.2.724 Tue Aug 31 10:05:29 2004 +++ php-src/NEWSTue Sep 14 00:28:46 2004 @@ -1,5 +1,8 @@ PHP 4 NEWS ||| +14 Sep 2004, Version 4.3.9RC3 +- GPC input processing fixes (Rasmus, Stefan) + 31 Aug 2004, Version 4.3.9RC2 - Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory exhaustion. (Andrei) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.123&r2=1.396.2.124&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.123 php-src/configure.in:1.396.2.124 --- php-src/configure.in:1.396.2.123Tue Aug 31 10:27:09 2004 +++ php-src/configure.inTue Sep 14 00:28:46 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.123 2004/08/31 14:27:09 iliaa Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.124 2004/09/14 04:28:46 iliaa Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=3 RELEASE_VERSION=9 -EXTRA_VERSION="RC3-dev" +EXTRA_VERSION="RC3" 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.65&r2=1.66.2.66&ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.65 php-src/main/php_version.h:1.66.2.66 --- php-src/main/php_version.h:1.66.2.65Tue Aug 31 10:27:09 2004 +++ php-src/main/php_version.h Tue Sep 14 00:28:47 2004 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 3 #define PHP_RELEASE_VERSION 9 -#define PHP_EXTRA_VERSION "RC3-dev" -#define PHP_VERSION "4.3.9RC3-dev" +#define PHP_EXTRA_VERSION "RC3" +#define PHP_VERSION "4.3.9RC3" -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h /main php_streams.h /main/streams filter.c php_stream_filter_api.h streams.c
pollita Mon Sep 13 23:48:17 2004 EDT
Modified files:
/php-src/ext/standard basic_functions.c streamsfuncs.c
streamsfuncs.h
/php-src/main php_streams.h
/php-src/main/streams filter.c php_stream_filter_api.h streams.c
/php-srcNEWS
Log:
Added stream_filter_remove() to cancel a stream filter.
Register filters as resources when
instantiated by stream_filter_(ap|pre)pend().
Export php_stream_filter_flush() internal function to wind buffered data
out of a particular filter until consumed by a later filter or sent to
stream->readbuffer or stream->ops->write()
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.686&r2=1.687&ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.686
php-src/ext/standard/basic_functions.c:1.687
--- php-src/ext/standard/basic_functions.c:1.686Fri Sep 10 16:45:33 2004
+++ php-src/ext/standard/basic_functions.c Mon Sep 13 23:48:16 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.686 2004/09/10 20:45:33 pollita Exp $ */
+/* $Id: basic_functions.c,v 1.687 2004/09/14 03:48:16 pollita Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -600,6 +600,7 @@
PHP_FE(stream_context_get_default,
NULL)
PHP_FE(stream_filter_prepend,
NULL)
PHP_FE(stream_filter_append,
NULL)
+ PHP_FE(stream_filter_remove,
NULL)
PHP_FE(stream_socket_client,
second_and_third_args_force_ref)
PHP_FE(stream_socket_server,
second_and_third_args_force_ref)
PHP_FE(stream_socket_accept,
third_arg_force_ref)
http://cvs.php.net/diff.php/php-src/ext/standard/streamsfuncs.c?r1=1.40&r2=1.41&ty=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.40
php-src/ext/standard/streamsfuncs.c:1.41
--- php-src/ext/standard/streamsfuncs.c:1.40Fri Aug 6 10:08:17 2004
+++ php-src/ext/standard/streamsfuncs.c Mon Sep 13 23:48:16 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.40 2004/08/06 14:08:17 wez Exp $ */
+/* $Id: streamsfuncs.c,v 1.41 2004/09/14 03:48:16 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -987,7 +987,7 @@
int filternamelen;
long read_write = 0;
zval *filterparams = NULL;
- php_stream_filter *filter;
+ php_stream_filter *filter = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|lz", &zstream,
&filtername, &filternamelen, &read_write,
&filterparams) == FAILURE) {
@@ -1036,10 +1036,14 @@
}
}
- RETURN_TRUE;
+ if (filter) {
+ RETURN_RESOURCE(ZEND_REGISTER_RESOURCE(NULL, filter,
php_file_le_stream_filter()));
+ } else {
+ RETURN_FALSE;
+ }
}
-/* {{{ proto bool stream_filter_prepend(resource stream, string filtername[, int
read_write[, string filterparams]])
+/* {{{ proto resource stream_filter_prepend(resource stream, string filtername[, int
read_write[, string filterparams]])
Prepend a filter to a stream */
PHP_FUNCTION(stream_filter_prepend)
{
@@ -1047,7 +1051,7 @@
}
/* }}} */
-/* {{{ proto bool stream_filter_append(resource stream, string filtername[, int
read_write[, string filterparams]])
+/* {{{ proto resource stream_filter_append(resource stream, string filtername[, int
read_write[, string filterparams]])
Append a filter to a stream */
PHP_FUNCTION(stream_filter_append)
{
@@ -1055,6 +1059,36 @@
}
/* }}} */
+/* {{{ proto bool stream_filter_remove(resource stream_filter)
+ Flushes any data in the filter's internal buffer, removes it from the chain,
and frees the resource */
+PHP_FUNCTION(stream_filter_remove)
+{
+ zval *zfilter;
+ php_stream_filter *filter;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zfilter) ==
FAILURE) {
+ RETURN_FALSE;
+ }
+
+ filter = zend_fetch_resource(&zfilter TSRMLS_CC, -1, NULL, NULL, 1,
php_file_le_stream_filter());
+ if (!filter) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid resource given,
not a stream filter");
+ RETURN_FALSE;
+ }
+
+ if (php_stream_filter_flush(filter, 1) == FAILURE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to flush
Re: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
Hello Rasmus, Hallo Rainer, Monday, September 13, 2004, 9:44:09 PM, you wrote: > On Mon, 13 Sep 2004, Rainer Schaaf wrote: >> > There is also the issue that the new pdflib license appears to be rather >> > evil. So maybe we should stick with the older version of the library. >> >> The new PDFlib-Lite license appeared with PDFlib 5. > Yes, I realize I am behind. I still use pdflib4 for pres2 stuff. Having > decent support for pdflib v4 is important as far as I am concerned since > that was the last version that people can use freely. Can't pres2 work with cpdflib? Or would it be an option to bundle pfdlib v4 with php? best regards marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams filter.c streams.c
pollita Mon Sep 13 17:07:23 2004 EDT
Modified files:
/php-src/main/streams streams.c filter.c
Log:
Allocating hash tables should be done via macro, not directly
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.65&r2=1.66&ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.65 php-src/main/streams/streams.c:1.66
--- php-src/main/streams/streams.c:1.65 Fri Sep 10 17:50:29 2004
+++ php-src/main/streams/streams.c Mon Sep 13 17:07:22 2004
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.65 2004/09/10 21:50:29 pollita Exp $ */
+/* $Id: streams.c,v 1.66 2004/09/13 21:07:22 pollita Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1414,7 +1414,7 @@
if (!FG(stream_wrappers)) {
php_stream_wrapper tmpwrapper;
- FG(stream_wrappers) = emalloc(sizeof(HashTable));
+ ALLOC_HASHTABLE(FG(stream_wrappers));
zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
zend_hash_copy(FG(stream_wrappers), &url_stream_wrappers_hash, NULL,
&tmpwrapper, sizeof(php_stream_wrapper));
}
@@ -1427,7 +1427,7 @@
if (!FG(stream_wrappers)) {
php_stream_wrapper tmpwrapper;
- FG(stream_wrappers) = emalloc(sizeof(HashTable));
+ ALLOC_HASHTABLE(FG(stream_wrappers));
zend_hash_init(FG(stream_wrappers), 0, NULL, NULL, 1);
zend_hash_copy(FG(stream_wrappers), &url_stream_wrappers_hash, NULL,
&tmpwrapper, sizeof(php_stream_wrapper));
}
http://cvs.php.net/diff.php/php-src/main/streams/filter.c?r1=1.13&r2=1.14&ty=u
Index: php-src/main/streams/filter.c
diff -u php-src/main/streams/filter.c:1.13 php-src/main/streams/filter.c:1.14
--- php-src/main/streams/filter.c:1.13 Mon Jun 21 17:08:05 2004
+++ php-src/main/streams/filter.c Mon Sep 13 17:07:22 2004
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: filter.c,v 1.13 2004/06/21 21:08:05 pollita Exp $ */
+/* $Id: filter.c,v 1.14 2004/09/13 21:07:22 pollita Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -60,7 +60,7 @@
if (!FG(stream_filters)) {
php_stream_filter_factory tmpfactory;
- FG(stream_filters) = emalloc(sizeof(HashTable));
+ ALLOC_HASHTABLE(FG(stream_filters));
zend_hash_init(FG(stream_filters), 0, NULL, NULL, 1);
zend_hash_copy(FG(stream_filters), &stream_filters_hash, NULL,
&tmpfactory, sizeof(php_stream_filter_factory));
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re[2]: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
On Mon, 13 Sep 2004, Rainer Schaaf wrote: > > There is also the issue that the new pdflib license appears to be rather > > evil. So maybe we should stick with the older version of the library. > > The new PDFlib-Lite license appeared with PDFlib 5. Yes, I realize I am behind. I still use pdflib4 for pres2 stuff. Having decent support for pdflib v4 is important as far as I am concerned since that was the last version that people can use freely. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re[2]: [PHP-CVS] cvs: php-src(PHP_4_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
Hello, Monday, September 13, 2004, 7:52:20 PM, you wrote: > On Mon, 13 Sep 2004, Ilia Alshanetsky wrote: >> I understand that the PDF extension does not work with the latest version of >> libpdf, however to my knowledge it works fine with the 5.X series of the >> library, which is still quite popular. It compiles fine with PDFlib 5.x but it does not use the new PDFlib 5 features, so it works fine with PDFlib 3/4 only, however you can compile it with PDFlib 5 as long as you use only the PDFlib 4 API's. >> It seems to me that removing a mostly working and a reasonably popular >> extension from a stable tree is not a good idea, especially this late in the >> release cycle. >> >> I think this decisions needs reconsidered or at the very least discussed >> further. > There is also the issue that the new pdflib license appears to be rather > evil. So maybe we should stick with the older version of the library. The new PDFlib-Lite license appeared with PDFlib 5. > -Rasmus -- Best regards, Rainer Schaaf [EMAIL PROTECTED]http://www.pdflib.com Personalize PDF: PDFlib Personalization Server and Block plugin ___PDFlib - a library for generating PDF on the fly -- 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/openssl openssl.c
magnus Mon Sep 13 14:31:51 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/opensslopenssl.c
Log:
Add missing stream unregister for sslv2 and 3.
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.89.2.1&r2=1.89.2.2&ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.89.2.1 php-src/ext/openssl/openssl.c:1.89.2.2
--- php-src/ext/openssl/openssl.c:1.89.2.1 Fri Sep 10 07:44:09 2004
+++ php-src/ext/openssl/openssl.c Mon Sep 13 14:31:51 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.89.2.1 2004/09/10 11:44:09 wez Exp $ */
+/* $Id: openssl.c,v 1.89.2.2 2004/09/13 18:31:51 magnus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -667,6 +667,8 @@
php_unregister_url_stream_wrapper("ftps" TSRMLS_CC);
php_stream_xport_unregister("ssl" TSRMLS_CC);
+ php_stream_xport_unregister("sslv2" TSRMLS_CC);
+ php_stream_xport_unregister("sslv3" TSRMLS_CC);
php_stream_xport_unregister("tls" TSRMLS_CC);
/* reinstate the default tcp handler */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/openssl openssl.c
magnus Mon Sep 13 14:30:30 2004 EDT
Modified files:
/php-src/ext/opensslopenssl.c
Log:
Add missing stream unregister for sslv2 and 3.
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.90&r2=1.91&ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.90 php-src/ext/openssl/openssl.c:1.91
--- php-src/ext/openssl/openssl.c:1.90 Fri Sep 10 07:43:45 2004
+++ php-src/ext/openssl/openssl.c Mon Sep 13 14:30:29 2004
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: openssl.c,v 1.90 2004/09/10 11:43:45 wez Exp $ */
+/* $Id: openssl.c,v 1.91 2004/09/13 18:30:29 magnus Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -667,6 +667,8 @@
php_unregister_url_stream_wrapper("ftps" TSRMLS_CC);
php_stream_xport_unregister("ssl" TSRMLS_CC);
+ php_stream_xport_unregister("sslv2" TSRMLS_CC);
+ php_stream_xport_unregister("sslv3" TSRMLS_CC);
php_stream_xport_unregister("tls" TSRMLS_CC);
/* reinstate the default tcp handler */
--
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_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
On Mon, 13 Sep 2004, Ilia Alshanetsky wrote: > I understand that the PDF extension does not work with the latest version of > libpdf, however to my knowledge it works fine with the 5.X series of the > library, which is still quite popular. > It seems to me that removing a mostly working and a reasonably popular > extension from a stable tree is not a good idea, especially this late in the > release cycle. > > I think this decisions needs reconsidered or at the very least discussed > further. There is also the issue that the new pdflib license appears to be rather evil. So maybe we should stick with the older version of the library. -Rasmus -- 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_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
Ilia Alshanetsky wrote: I understand that the PDF extension does not work with the latest version of libpdf, however to my knowledge it works fine with the 5.X series of the library, which is still quite popular. It seems to me that removing a mostly working and a reasonably popular extension from a stable tree is not a good idea, especially this late in the release cycle. +1 I think this decisions needs reconsidered or at the very least discussed further. I think having PDFLib in there without newer support is *exactly* the point of maintaining an old release while developing on the new release. PHP4 is there regardless of whether or not its perfect, and it won't be having any major functionality changes or new ways of viewing the world. -Sterling -- 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_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
I understand that the PDF extension does not work with the latest version of libpdf, however to my knowledge it works fine with the 5.X series of the library, which is still quite popular. It seems to me that removing a mostly working and a reasonably popular extension from a stable tree is not a good idea, especially this late in the release cycle. I think this decisions needs reconsidered or at the very least discussed further. 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_4_3) /ext/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
It's considered very bad form to change stuff on a frozen release branch without the permission of the release manager, especially in the middle of a release cycle. --Wez. On Mon, 13 Sep 2004 15:12:25 -, Rainer Schaaf <[EMAIL PROTECTED]> wrote: > rjs Mon Sep 13 11:12:25 2004 EDT > > Removed files: (Branch: PHP_4_3) > /php-src/ext/pdfCREDITS pdf.c pdf.dsp php_pdf.h > > Modified files: > /php-src/ext/pdfconfig.m4 > Log: > removed PDFlib extension from PHP_4_3 branch too (is available in PECL now). > > http://cvs.php.net/diff.php/php-src/ext/pdf/config.m4?r1=1.35.2.2&r2=1.35.2.3&ty=u > Index: php-src/ext/pdf/config.m4 > diff -u php-src/ext/pdf/config.m4:1.35.2.2 php-src/ext/pdf/config.m4:1.35.2.3 > --- php-src/ext/pdf/config.m4:1.35.2.2 Sun Jul 13 23:58:47 2003 > +++ php-src/ext/pdf/config.m4 Mon Sep 13 11:12:25 2004 > @@ -1,137 +1,10 @@ > dnl > -dnl $Id: config.m4,v 1.35.2.2 2003/07/14 03:58:47 sniper Exp $ > +dnl $Id: config.m4,v 1.35.2.3 2004/09/13 15:12:25 rjs Exp $ > dnl > > -PHP_ARG_WITH(pdflib,for PDFlib support, > -[ --with-pdflib[=DIR] Include PDFlib support.]) > - > -if test -z "$PHP_JPEG_DIR"; then > - PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, > - [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. > - (OPTIONAL for PDFlib v4)], no, no) > -fi > - > -if test -z "$PHP_PNG_DIR"; then > - PHP_ARG_WITH(png-dir, for the location of libpng, > - [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. > - (OPTIONAL for PDFlib v4)], no, no) > -fi > - > -if test -z "$PHP_ZLIB_DIR"; then > - PHP_ARG_WITH(zlib-dir, for the location of libz, > - [ --with-zlib-dir[=DIR] PDFLIB: define libz install directory. > - (OPTIONAL for PDFlib v4)], no, no) > -fi > - > -PHP_ARG_WITH(tiff-dir, for the location of libtiff, > -[ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. > - (OPTIONAL for PDFlib v4)], no, no) > +PHP_ARG_WITH(pdflib, whether to include PDFlib support, > +[ --with-pdflib PDFlib support is part of PECL now.]) > > if test "$PHP_PDFLIB" != "no"; then > - > - PHP_NEW_EXTENSION(pdf, pdf.c, $ext_shared) > - PHP_SUBST(PDF_SHARED_LIBADD) > - > - dnl # > - dnl # Optional libraries for PDFlib > - dnl # > - > - dnl # libjpeg > - if test "$PHP_JPEG_DIR" != "no"; then > -PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, > -[ > - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDF_SHARED_LIBADD) > -],[ > - AC_MSG_ERROR([libjpeg not found!]) > -],[ > - -L$PHP_JPEG_DIR/lib > -]) > - else > -AC_MSG_WARN([If configure fails, try --with-jpeg-dir=]) > - fi > - > - dnl # libpng > - if test "$PHP_PNG_DIR" != "no"; then > -PHP_CHECK_LIBRARY(png,png_create_info_struct, > -[ > - PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDF_SHARED_LIBADD) > -],[ > - AC_MSG_ERROR([libpng not found!]) > -],[ > - -L$PHP_PNG_DIR/lib > -]) > - else > -AC_MSG_WARN([If configure fails, try --with-png-dir=]) > - fi > - > - dnl # libtiff > - if test "$PHP_TIFF_DIR" != "no"; then > -PHP_CHECK_LIBRARY(tiff,TIFFOpen, > -[ > - PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDF_SHARED_LIBADD) > -],[ > - AC_MSG_ERROR([libtiff not found!]) > -],[ > - -L$PHP_TIFF_DIR/lib > -]) > - else > -AC_MSG_WARN([If configure fails, try --with-tiff-dir=]) > - fi > - > - dnl # zlib > - AC_MSG_CHECKING([for the location of zlib]) > - if test "$PHP_ZLIB_DIR" = "no"; then > -AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=]) > - else > -AC_MSG_RESULT([$PHP_ZLIB_DIR]) > -PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDF_SHARED_LIBADD) > - fi > - > - dnl # > - dnl # The main PDFlib configure > - dnl # > - > - dnl # MacOSX requires this > - case $host_alias in > -*darwin*) > - PHP_ADD_FRAMEWORK(CoreServices) > - PHP_ADD_FRAMEWORK(ApplicationServices) > - ;; > - esac > - > - case $PHP_PDFLIB in > -yes) > - AC_CHECK_LIB(pdf, PDF_show_boxed, [ > -AC_DEFINE(HAVE_PDFLIB,1,[ ]) > -PHP_ADD_LIBRARY(pdf,, PDF_SHARED_LIBADD) > - ],[ > -AC_MSG_ERROR([ > -PDFlib extension requires at least pdflib 3.x. You may also need libtiff, libjpeg, > libpng and libz. > -Use the options --with-tiff-dir=, --with-jpeg-dir=, --with-png-dir= > and --with-zlib-dir= > -See config.log for more information. > -]) > - ]) > -;; > -*) > - if test -f "$PHP_PDFLIB/include/pdflib.h" ; then > - > -PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, > -[ > - AC_DEFINE(HAVE_PDFLIB,1,[ ]) > - PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDF_SHARED_LIBADD) > - PHP_ADD_INCLUDE($PHP_PDFLIB/include) > -],[ > - AC_MSG_ERROR([ > -PDFlib extensi
[PHP-CVS] cvs: php-src(PHP_4_3) /main rfc1867.c
sesser Mon Sep 13 12:00:50 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main rfc1867.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.122.2.25&r2=1.122.2.26&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.122.2.25 php-src/main/rfc1867.c:1.122.2.26
--- php-src/main/rfc1867.c:1.122.2.25 Sun Sep 12 06:46:49 2004
+++ php-src/main/rfc1867.c Mon Sep 13 12:00:50 2004
@@ -16,7 +16,7 @@
| Jani Taskinen <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: rfc1867.c,v 1.122.2.25 2004/09/12 10:46:49 sesser Exp $ */
+/* $Id: rfc1867.c,v 1.122.2.26 2004/09/13 16:00:50 sesser Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -943,6 +943,10 @@
c++;
} else if (*tmp == ']') {
c--;
+ if (tmp[1] && tmp[1] != '[') {
+ skip_upload = 1;
+ break;
+ }
}
if (c < 0) {
skip_upload = 1;
--
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 rfc1867.c
sesser Mon Sep 13 12:00:37 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main rfc1867.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.159.2.3&r2=1.159.2.4&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.159.2.3 php-src/main/rfc1867.c:1.159.2.4
--- php-src/main/rfc1867.c:1.159.2.3Sun Sep 12 06:46:27 2004
+++ php-src/main/rfc1867.c Mon Sep 13 12:00:37 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.159.2.3 2004/09/12 10:46:27 sesser Exp $ */
+/* $Id: rfc1867.c,v 1.159.2.4 2004/09/13 16:00:37 sesser Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -950,6 +950,10 @@
c++;
} else if (*tmp == ']') {
c--;
+ if (tmp[1] && tmp[1] != '[') {
+ skip_upload = 1;
+ break;
+ }
}
if (c < 0) {
skip_upload = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main rfc1867.c
sesser Mon Sep 13 12:00:23 2004 EDT
Modified files:
/php-src/main rfc1867.c
Log:
only allow valid arrays at this point
http://cvs.php.net/diff.php/php-src/main/rfc1867.c?r1=1.162&r2=1.163&ty=u
Index: php-src/main/rfc1867.c
diff -u php-src/main/rfc1867.c:1.162 php-src/main/rfc1867.c:1.163
--- php-src/main/rfc1867.c:1.162Sun Sep 12 06:45:14 2004
+++ php-src/main/rfc1867.c Mon Sep 13 12:00:23 2004
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: rfc1867.c,v 1.162 2004/09/12 10:45:14 sesser Exp $ */
+/* $Id: rfc1867.c,v 1.163 2004/09/13 16:00:23 sesser Exp $ */
/*
* This product includes software developed by the Apache Group
@@ -950,6 +950,10 @@
c++;
} else if (*tmp == ']') {
c--;
+ if (tmp[1] && tmp[1] != '[') {
+ skip_upload = 1;
+ break;
+ }
}
if (c < 0) {
skip_upload = 1;
--
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/pdf CREDITS config.m4 pdf.c pdf.dsp php_pdf.h
rjs Mon Sep 13 11:12:25 2004 EDT Removed files: (Branch: PHP_4_3) /php-src/ext/pdfCREDITS pdf.c pdf.dsp php_pdf.h Modified files: /php-src/ext/pdfconfig.m4 Log: removed PDFlib extension from PHP_4_3 branch too (is available in PECL now). http://cvs.php.net/diff.php/php-src/ext/pdf/config.m4?r1=1.35.2.2&r2=1.35.2.3&ty=u Index: php-src/ext/pdf/config.m4 diff -u php-src/ext/pdf/config.m4:1.35.2.2 php-src/ext/pdf/config.m4:1.35.2.3 --- php-src/ext/pdf/config.m4:1.35.2.2 Sun Jul 13 23:58:47 2003 +++ php-src/ext/pdf/config.m4 Mon Sep 13 11:12:25 2004 @@ -1,137 +1,10 @@ dnl -dnl $Id: config.m4,v 1.35.2.2 2003/07/14 03:58:47 sniper Exp $ +dnl $Id: config.m4,v 1.35.2.3 2004/09/13 15:12:25 rjs Exp $ dnl -PHP_ARG_WITH(pdflib,for PDFlib support, -[ --with-pdflib[=DIR] Include PDFlib support.]) - -if test -z "$PHP_JPEG_DIR"; then - PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, - [ --with-jpeg-dir[=DIR] PDFLIB: define libjpeg install directory. - (OPTIONAL for PDFlib v4)], no, no) -fi - -if test -z "$PHP_PNG_DIR"; then - PHP_ARG_WITH(png-dir, for the location of libpng, - [ --with-png-dir[=DIR] PDFLIB: define libpng install directory. - (OPTIONAL for PDFlib v4)], no, no) -fi - -if test -z "$PHP_ZLIB_DIR"; then - PHP_ARG_WITH(zlib-dir, for the location of libz, - [ --with-zlib-dir[=DIR] PDFLIB: define libz install directory. - (OPTIONAL for PDFlib v4)], no, no) -fi - -PHP_ARG_WITH(tiff-dir, for the location of libtiff, -[ --with-tiff-dir[=DIR] PDFLIB: define libtiff install directory. - (OPTIONAL for PDFlib v4)], no, no) +PHP_ARG_WITH(pdflib, whether to include PDFlib support, +[ --with-pdflib PDFlib support is part of PECL now.]) if test "$PHP_PDFLIB" != "no"; then - - PHP_NEW_EXTENSION(pdf, pdf.c, $ext_shared) - PHP_SUBST(PDF_SHARED_LIBADD) - - dnl # - dnl # Optional libraries for PDFlib - dnl # - - dnl # libjpeg - if test "$PHP_JPEG_DIR" != "no"; then -PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, -[ - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $PHP_JPEG_DIR/lib, PDF_SHARED_LIBADD) -],[ - AC_MSG_ERROR([libjpeg not found!]) -],[ - -L$PHP_JPEG_DIR/lib -]) - else -AC_MSG_WARN([If configure fails, try --with-jpeg-dir=]) - fi - - dnl # libpng - if test "$PHP_PNG_DIR" != "no"; then -PHP_CHECK_LIBRARY(png,png_create_info_struct, -[ - PHP_ADD_LIBRARY_WITH_PATH(png, $PHP_PNG_DIR/lib, PDF_SHARED_LIBADD) -],[ - AC_MSG_ERROR([libpng not found!]) -],[ - -L$PHP_PNG_DIR/lib -]) - else -AC_MSG_WARN([If configure fails, try --with-png-dir=]) - fi - - dnl # libtiff - if test "$PHP_TIFF_DIR" != "no"; then -PHP_CHECK_LIBRARY(tiff,TIFFOpen, -[ - PHP_ADD_LIBRARY_WITH_PATH(tiff, $PHP_TIFF_DIR/lib, PDF_SHARED_LIBADD) -],[ - AC_MSG_ERROR([libtiff not found!]) -],[ - -L$PHP_TIFF_DIR/lib -]) - else -AC_MSG_WARN([If configure fails, try --with-tiff-dir=]) - fi - - dnl # zlib - AC_MSG_CHECKING([for the location of zlib]) - if test "$PHP_ZLIB_DIR" = "no"; then -AC_MSG_RESULT([no. If configure fails, try --with-zlib-dir=]) - else -AC_MSG_RESULT([$PHP_ZLIB_DIR]) -PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, PDF_SHARED_LIBADD) - fi - - dnl # - dnl # The main PDFlib configure - dnl # - - dnl # MacOSX requires this - case $host_alias in -*darwin*) - PHP_ADD_FRAMEWORK(CoreServices) - PHP_ADD_FRAMEWORK(ApplicationServices) - ;; - esac - - case $PHP_PDFLIB in -yes) - AC_CHECK_LIB(pdf, PDF_show_boxed, [ -AC_DEFINE(HAVE_PDFLIB,1,[ ]) -PHP_ADD_LIBRARY(pdf,, PDF_SHARED_LIBADD) - ],[ -AC_MSG_ERROR([ -PDFlib extension requires at least pdflib 3.x. You may also need libtiff, libjpeg, libpng and libz. -Use the options --with-tiff-dir=, --with-jpeg-dir=, --with-png-dir= and --with-zlib-dir= -See config.log for more information. -]) - ]) -;; -*) - if test -f "$PHP_PDFLIB/include/pdflib.h" ; then - -PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, -[ - AC_DEFINE(HAVE_PDFLIB,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDF_SHARED_LIBADD) - PHP_ADD_INCLUDE($PHP_PDFLIB/include) -],[ - AC_MSG_ERROR([ -PDFlib extension requires at least pdflib 3.x. You may also need libtiff, libjpeg, libpng and libz. -Use the options --with-tiff-dir=, --with-jpeg-dir=, --with-png-dir= and --with-zlib-dir= -See config.log for more information. -]) -],[ - -L$PHP_PDFLIB/lib $PDF_SHARED_LIBADD -]) - else -AC_MSG_ERROR([pdflib.h not found! Check the path passed to --with-pdflib=. PATH should be the install prefix directory.]) - fi -;; - esac + AC_MSG_ERROR([The PDFlib extension
[PHP-CVS] cvs: php-src /ext/soap soap.c /ext/soap/interop client_round2_interop.php /ext/soap/tests transport001.phpt /ext/soap/tests/bugs bug28969.phpt bug29795.phpt bug29839.phpt bug29844.phpt
dmitry Mon Sep 13 07:55:25 2004 EDT
Modified files:
/php-src/ext/soap soap.c
/php-src/ext/soap/interop client_round2_interop.php
/php-src/ext/soap/tests transport001.phpt
/php-src/ext/soap/tests/bugsbug28969.phpt bug29795.phpt
bug29839.phpt bug29844.phpt
Log:
Change soap's ctors to __construct(),
rename SoapClient->__call() to SoapClinet->__soapCall().
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.119&r2=1.120&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.119 php-src/ext/soap/soap.c:1.120
--- php-src/ext/soap/soap.c:1.119 Fri Sep 10 05:02:05 2004
+++ php-src/ext/soap/soap.c Mon Sep 13 07:55:24 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: soap.c,v 1.119 2004/09/10 09:02:05 dmitry Exp $ */
+/* $Id: soap.c,v 1.120 2004/09/13 11:55:24 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -251,6 +251,12 @@
/* SoapHeader Functions */
PHP_METHOD(SoapHeader, SoapHeader);
+#ifdef ZEND_ENGINE_2
+#define SOAP_CTOR(class_name, func_name, arginfo, flags) ZEND_FENTRY(__construct,
ZEND_FN(class_name##_##func_name), arginfo, flags)
+#else
+#define SOAP_CTOR(class_name, func_name, arginfo, flags) PHP_ME(class_name,
func_name, arginfo, flags)
+#endif
+
static zend_function_entry soap_functions[] = {
#ifdef HAVE_PHP_DOMXML
PHP_FE(soap_encode_to_xml, NULL)
@@ -262,7 +268,7 @@
};
static zend_function_entry soap_fault_functions[] = {
- PHP_ME(SoapFault, SoapFault, NULL, 0)
+ SOAP_CTOR(SoapFault, SoapFault, NULL, 0)
#ifdef ZEND_ENGINE_2
PHP_ME(SoapFault, __toString, NULL, 0)
#endif
@@ -270,7 +276,7 @@
};
static zend_function_entry soap_server_functions[] = {
- PHP_ME(SoapServer, SoapServer, NULL, 0)
+ SOAP_CTOR(SoapServer, SoapServer, NULL, 0)
PHP_ME(SoapServer, setPersistence, NULL, 0)
PHP_ME(SoapServer, setClass, NULL, 0)
PHP_ME(SoapServer, addFunction, NULL, 0)
@@ -301,12 +307,12 @@
#endif
static zend_function_entry soap_client_functions[] = {
- PHP_ME(SoapClient, SoapClient, NULL, 0)
+ SOAP_CTOR(SoapClient, SoapClient, NULL, 0)
PHP_ME(SoapClient, __call, __call_args, 0)
#ifdef ZEND_ENGINE_2
- ZEND_FENTRY(__soap_call, ZEND_FN(SoapClient___call), __soap_call_args, 0)
+ ZEND_FENTRY(__soapCall, ZEND_FN(SoapClient___call), __soap_call_args, 0)
#else
- ZEND_NAMED_FE(__soap_call, ZEND_FN(SoapClient___call), __soap_call_args)
+ ZEND_NAMED_FE(__soapCall, ZEND_FN(SoapClient___call), __soap_call_args)
#endif
PHP_ME(SoapClient, __getLastRequest, NULL, 0)
PHP_ME(SoapClient, __getLastResponse, NULL, 0)
@@ -319,17 +325,17 @@
};
static zend_function_entry soap_var_functions[] = {
- PHP_ME(SoapVar, SoapVar, NULL, 0)
+ SOAP_CTOR(SoapVar, SoapVar, NULL, 0)
{NULL, NULL, NULL}
};
static zend_function_entry soap_param_functions[] = {
- PHP_ME(SoapParam, SoapParam, NULL, 0)
+ SOAP_CTOR(SoapParam, SoapParam, NULL, 0)
{NULL, NULL, NULL}
};
static zend_function_entry soap_header_functions[] = {
- PHP_ME(SoapHeader, SoapHeader, NULL, 0)
+ SOAP_CTOR(SoapHeader, SoapHeader, NULL, 0)
{NULL, NULL, NULL}
};
http://cvs.php.net/diff.php/php-src/ext/soap/interop/client_round2_interop.php?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/soap/interop/client_round2_interop.php
diff -u php-src/ext/soap/interop/client_round2_interop.php:1.16
php-src/ext/soap/interop/client_round2_interop.php:1.17
--- php-src/ext/soap/interop/client_round2_interop.php:1.16 Fri Sep 10 05:02:06
2004
+++ php-src/ext/soap/interop/client_round2_interop.php Mon Sep 13 07:55:24 2004
@@ -16,7 +16,7 @@
// | Authors: Shane Caraveo <[EMAIL PROTECTED]> |
// +--+
//
-// $Id: client_round2_interop.php,v 1.16 2004/09/10 09:02:06 dmitry Exp $
+// $Id: client_round2_interop.php,v 1.17 2004/09/13 11:55:24 dmitry Exp $
//
require_once 'DB.php'; // PEAR/DB
require_once 'client_round2_params.php';
@@ -94,7 +94,7 @@
$this->_getEndpoints($test, 1);
// retreive endpoints from the endpoint server
-$endpointArray =
$soapclient->__soap_call("GetEndpointInfo",array("groupName"=>$test),array('soapaction'=>"http://soapinterop.org/";,'uri'=>"http://soapinterop.org/";));
+$endpointArray =
$soapclient->__soapCall("GetEndpointInfo",array("groupName"=>$test),array('soapaction'=>"http://soapinterop.org/";,'uri'=>"http://soapinterop.org/";));
if (is_soap_fault($endpointArray) || PEAR::isError($endpointArray)) {
if ($this->html) print "";
print $soapclient->wire."\n";
@@ -428,9 +428,9 @@
$return = eval('return
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/soap soap.c /ext/soap/interop client_round2_interop.php /ext/soap/tests transport001.phpt /ext/soap/tests/bugs bug28969.phpt bug29795.phpt bug29839.phpt bug29844.phpt
dmitry Mon Sep 13 07:54:06 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap soap.c
/php-src/ext/soap/interop client_round2_interop.php
/php-src/ext/soap/tests transport001.phpt
/php-src/ext/soap/tests/bugsbug28969.phpt bug29795.phpt
bug29839.phpt bug29844.phpt
Log:
Change soap's ctors to __construct(),
rename SoapClient->__call() to SoapClinet->__soapCall().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.70&r2=1.1760.2.71&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.70 php-src/NEWS:1.1760.2.71
--- php-src/NEWS:1.1760.2.70Sat Sep 11 10:20:55 2004
+++ php-src/NEWSMon Sep 13 07:54:05 2004
@@ -9,7 +9,7 @@
(Paul Hudson, Derick)
- Implemented periodic PCRE compiled regexp cache cleanup, to avoid memory
exhaustion. (Andrei)
-- Renamed SoapClient->__call() to SoapClinet->__soap_call(). (Dmitry)
+- Renamed SoapClient->__call() to SoapClinet->__soapCall(). (Dmitry)
- Fixed bug with raw_post_data not getting set (Brian)
- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
- Fixed bug #29985 (unserialize()/ __PHP_Incomplete_class does not report
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.6&r2=1.110.2.7&ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.6 php-src/ext/soap/soap.c:1.110.2.7
--- php-src/ext/soap/soap.c:1.110.2.6 Fri Sep 10 05:03:25 2004
+++ php-src/ext/soap/soap.c Mon Sep 13 07:54:05 2004
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+--+
*/
-/* $Id: soap.c,v 1.110.2.6 2004/09/10 09:03:25 dmitry Exp $ */
+/* $Id: soap.c,v 1.110.2.7 2004/09/13 11:54:05 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -251,6 +251,12 @@
/* SoapHeader Functions */
PHP_METHOD(SoapHeader, SoapHeader);
+#ifdef ZEND_ENGINE_2
+#define SOAP_CTOR(class_name, func_name, arginfo, flags) ZEND_FENTRY(__construct,
ZEND_FN(class_name##_##func_name), arginfo, flags)
+#else
+#define SOAP_CTOR(class_name, func_name, arginfo, flags) PHP_ME(class_name,
func_name, arginfo, flags)
+#endif
+
static zend_function_entry soap_functions[] = {
#ifdef HAVE_PHP_DOMXML
PHP_FE(soap_encode_to_xml, NULL)
@@ -262,7 +268,7 @@
};
static zend_function_entry soap_fault_functions[] = {
- PHP_ME(SoapFault, SoapFault, NULL, 0)
+ SOAP_CTOR(SoapFault, SoapFault, NULL, 0)
#ifdef ZEND_ENGINE_2
PHP_ME(SoapFault, __toString, NULL, 0)
#endif
@@ -270,7 +276,7 @@
};
static zend_function_entry soap_server_functions[] = {
- PHP_ME(SoapServer, SoapServer, NULL, 0)
+ SOAP_CTOR(SoapServer, SoapServer, NULL, 0)
PHP_ME(SoapServer, setPersistence, NULL, 0)
PHP_ME(SoapServer, setClass, NULL, 0)
PHP_ME(SoapServer, addFunction, NULL, 0)
@@ -301,12 +307,12 @@
#endif
static zend_function_entry soap_client_functions[] = {
- PHP_ME(SoapClient, SoapClient, NULL, 0)
+ SOAP_CTOR(SoapClient, SoapClient, NULL, 0)
PHP_ME(SoapClient, __call, __call_args, 0)
#ifdef ZEND_ENGINE_2
- ZEND_FENTRY(__soap_call, ZEND_FN(SoapClient___call), __soap_call_args, 0)
+ ZEND_FENTRY(__soapCall, ZEND_FN(SoapClient___call), __soap_call_args, 0)
#else
- ZEND_NAMED_FE(__soap_call, ZEND_FN(SoapClient___call), __soap_call_args)
+ ZEND_NAMED_FE(__soapCall, ZEND_FN(SoapClient___call), __soap_call_args)
#endif
PHP_ME(SoapClient, __getLastRequest, NULL, 0)
PHP_ME(SoapClient, __getLastResponse, NULL, 0)
@@ -319,17 +325,17 @@
};
static zend_function_entry soap_var_functions[] = {
- PHP_ME(SoapVar, SoapVar, NULL, 0)
+ SOAP_CTOR(SoapVar, SoapVar, NULL, 0)
{NULL, NULL, NULL}
};
static zend_function_entry soap_param_functions[] = {
- PHP_ME(SoapParam, SoapParam, NULL, 0)
+ SOAP_CTOR(SoapParam, SoapParam, NULL, 0)
{NULL, NULL, NULL}
};
static zend_function_entry soap_header_functions[] = {
- PHP_ME(SoapHeader, SoapHeader, NULL, 0)
+ SOAP_CTOR(SoapHeader, SoapHeader, NULL, 0)
{NULL, NULL, NULL}
};
http://cvs.php.net/diff.php/php-src/ext/soap/interop/client_round2_interop.php?r1=1.15.2.1&r2=1.15.2.2&ty=u
Index: php-src/ext/soap/interop/client_round2_interop.php
diff -u php-src/ext/soap/interop/client_round2_interop.php:1.15.2.1
php-src/ext/soap/interop/client_round2_interop.php:1.15.2.2
--- php-src/ext/soap/interop/client_round2_interop.php:1.15.2.1 Fri Sep 10 05:03:25
2004
+++ php-src/ext/soap/interop/client_round2_interop.php Mon Sep 13 07:54:06 2004
@@ -16,7 +16,7 @@
// | Authors: Shane Caraveo <[EMAIL PROTECTED]> |
// +--+
//
-// $Id: client_round2_interop.php,v 1.15.2.1 2004/09/10 09:03:25 dmitry Exp $
+// $Id: clien
