[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Apr 20 05:31:44 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2320r2=1.2321diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2320 php-src/ChangeLog:1.2321 --- php-src/ChangeLog:1.2320Wed Apr 19 05:31:44 2006 +++ php-src/ChangeLog Thu Apr 20 05:31:44 2006 @@ -1,3 +1,28 @@ +2006-04-19 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + Cleaned up Andrei's patch for caching WSDL in process memory, added TTL and + LIMIT for memory cache. + Memory cache is disblead by fefault because it is experemental and isn't + tested enough. It can be enabled whit configuartion directive + soap.wsdl_cache = WSDL_CACHE_MEMORY or soap.wsdl_cache = + WSDL_CACHE_BOTH or derectly in SoapClent/SoapServer constructor: $ws = + new SoapClient($wsdl, array(cache_wsdl=WSDL_CACHE_BOTH)) + Disk and memory caches use the same TTL value - soap.wsdl_cache_ttl. + Configuration directive soap.wsdl_cache_limit restricts the number of + cached wsdl files in memory. Adding new files into full memory cache will + delete oldest files from it. + Note that, each PHP process or thread uses it's own memory cache. + +* ZendEngine2/zend.c: + Fixed cleanup dependent on uninitialized value + +2006-04-19 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/streamsfuncs.c: + fix typo (see #35900) + 2006-04-18 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_1)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Apr 20 05:31:50 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/ZendEngine2/ChangeLog?r1=1.901r2=1.902diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.901 ZendEngine2/ChangeLog:1.902 --- ZendEngine2/ChangeLog:1.901 Wed Apr 19 05:31:51 2006 +++ ZendEngine2/ChangeLog Thu Apr 20 05:31:50 2006 @@ -1,3 +1,8 @@ +2006-04-19 Dmitry Stogov [EMAIL PROTECTED] + +* zend.c: + Fixed cleanup dependent on uninitialized value + 2006-04-18 Sara Golemon [EMAIL PROTECTED] * zend_API.c: @@ -13175,7 +13180,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.901 2006/04/19 05:31:51 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.902 2006/04/20 05:31:50 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -14899,7 +14904,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.901 2006/04/19 05:31:51 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.902 2006/04/20 05:31:50 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/standard streamsfuncs.c
tony2001Wed Apr 19 08:43:05 2006 UTC
Modified files:
/php-src/ext/standard streamsfuncs.c
Log:
fix typo (see #35900)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.76r2=1.77diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.76
php-src/ext/standard/streamsfuncs.c:1.77
--- php-src/ext/standard/streamsfuncs.c:1.76Fri Apr 14 10:01:34 2006
+++ php-src/ext/standard/streamsfuncs.c Wed Apr 19 08:43:05 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.76 2006/04/14 10:01:34 tony2001 Exp $ */
+/* $Id: streamsfuncs.c,v 1.77 2006/04/19 08:43:05 tony2001 Exp $ */
#include php.h
#include php_globals.h
@@ -759,7 +759,7 @@
if (sec != NULL) {
convert_to_long(sec);
- if (sec 0) {
+ if (Z_LVAL_P(sec) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The
seconds parameter must be greater than 0.);
RETURN_FALSE;
} else if (usec 0) {
--
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/standard streamsfuncs.c
tony2001Wed Apr 19 08:43:29 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard streamsfuncs.c
Log:
MFH: fix typo
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.5r2=1.58.2.6diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.5
php-src/ext/standard/streamsfuncs.c:1.58.2.6
--- php-src/ext/standard/streamsfuncs.c:1.58.2.5Fri Apr 14 10:00:55 2006
+++ php-src/ext/standard/streamsfuncs.c Wed Apr 19 08:43:29 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.5 2006/04/14 10:00:55 tony2001 Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6 2006/04/19 08:43:29 tony2001 Exp $ */
#include php.h
#include php_globals.h
@@ -754,7 +754,7 @@
if (sec != NULL) {
convert_to_long(sec);
- if (sec 0) {
+ if (Z_LVAL_P(sec) 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The
seconds parameter must be greater than 0.);
RETURN_FALSE;
} else if (usec 0) {
--
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/soap php_sdl.c php_sdl.h php_soap.h soap.c /ext/soap/tests/bugs bug37083.phpt
dmitry Wed Apr 19 10:48:54 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/soap php_sdl.c php_sdl.h php_soap.h soap.c
/php-src/ext/soap/tests/bugsbug37083.phpt
Log:
Cleaned up Andrei's patch for caching WSDL in process memory, added TTL and
LIMIT for memory cache.
Memory cache is disblead by fefault because it is experemental and isn't
tested enough. It can be enabled whit configuartion directive soap.wsdl_cache
= WSDL_CACHE_MEMORY or soap.wsdl_cache = WSDL_CACHE_BOTH or derectly in
SoapClent/SoapServer constructor: $ws = new SoapClient($wsdl,
array(cache_wsdl=WSDL_CACHE_BOTH))
Disk and memory caches use the same TTL value - soap.wsdl_cache_ttl.
Configuration directive soap.wsdl_cache_limit restricts the number of
cached wsdl files in memory. Adding new files into full memory cache will
delete oldest files from it.
Note that, each PHP process or thread uses it's own memory cache.
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.520r2=1.2027.2.521diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.520 php-src/NEWS:1.2027.2.521
--- php-src/NEWS:1.2027.2.520 Tue Apr 18 14:30:16 2006
+++ php-src/NEWSWed Apr 19 10:48:54 2006
@@ -30,7 +30,7 @@
06 Apr 2006, PHP 5.1.3RC3
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
- Changed SOAP extension to cache WSDL structure in memory and thus speed up
- SoapClient/SoapServer construction. (Andrei)
+ SoapClient/SoapServer construction. (Andrei, Dmitry)
- Removed the E_STRICT deprecation notice from var. (Ilia)
- Added overflow checks to wordwrap() function. (Ilia)
- Added support for BINARY_DOUBLE and BINARY_FLOAT to PDO_OCI and OCI8
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.11r2=1.88.2.12diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.11
php-src/ext/soap/php_sdl.c:1.88.2.12
--- php-src/ext/soap/php_sdl.c:1.88.2.11Tue Apr 18 13:07:59 2006
+++ php-src/ext/soap/php_sdl.c Wed Apr 19 10:48:54 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.11 2006/04/18 13:07:59 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12 2006/04/19 10:48:54 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -1417,7 +1417,7 @@
return ht;
}
-static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t
TSRMLS_DC)
+static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t,
time_t *cached TSRMLS_DC)
{
sdlPtr sdl;
time_t old_t;
@@ -1461,6 +1461,7 @@
efree(buf);
return NULL;
}
+ *cached = old_t;
WSDL_CACHE_GET_INT(i, in);
if (i == 0 strncmp(in, uri, i) != 0) {
@@ -3027,29 +3028,109 @@
return psdl;
}
-sdlPtr get_sdl(zval *this_ptr, char *uri, zend_bool persistent TSRMLS_DC)
+typedef struct _sdl_cache_bucket {
+ sdlPtr sdl;
+ time_t time;
+} sdl_cache_bucket;
+
+static void delete_psdl(void *data)
+{
+ sdl_cache_bucket *p = (sdl_cache_bucket*)data;
+ sdlPtr tmp = p-sdl;
+
+ zend_hash_destroy(tmp-functions);
+ if (tmp-source) {
+ free(tmp-source);
+ }
+ if (tmp-target_ns) {
+ free(tmp-target_ns);
+ }
+ if (tmp-elements) {
+ zend_hash_destroy(tmp-elements);
+ free(tmp-elements);
+ }
+ if (tmp-encoders) {
+ zend_hash_destroy(tmp-encoders);
+ free(tmp-encoders);
+ }
+ if (tmp-types) {
+ zend_hash_destroy(tmp-types);
+ free(tmp-types);
+ }
+ if (tmp-groups) {
+ zend_hash_destroy(tmp-groups);
+ free(tmp-groups);
+ }
+ if (tmp-bindings) {
+ zend_hash_destroy(tmp-bindings);
+ free(tmp-bindings);
+ }
+ if (tmp-requests) {
+ zend_hash_destroy(tmp-requests);
+ free(tmp-requests);
+ }
+ free(tmp);
+}
+
+sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC)
{
+ char fn[MAXPATHLEN];
sdlPtr sdl = NULL;
char* old_error_code = SOAP_GLOBAL(error_code);
- int uri_len;
+ int uri_len = 0;
php_stream_context *context=NULL;
zval **tmp, **proxy_host, **proxy_port, *orig_context = NULL,
*new_context = NULL;
smart_str headers = {0};
- char *pkey = NULL;
- int plen;
+ char* key = NULL;
+ time_t t = time(0);
+
+ if (strchr(uri,':') != NULL || IS_ABSOLUTE_PATH(uri, uri_len)) {
+ uri_len = strlen(uri);
+ } else if (VCWD_REALPATH(uri, fn) == NULL) {
+ cache_wsdl = WSDL_CACHE_NONE;
+ } else {
+ uri = fn;
+
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c php_sdl.h php_soap.h soap.c /ext/soap/tests/bugs bug37083.phpt
dmitry Wed Apr 19 10:49:16 2006 UTC
Modified files:
/php-src/ext/soap php_sdl.c php_sdl.h php_soap.h soap.c
/php-src/ext/soap/tests/bugsbug37083.phpt
Log:
Cleaned up Andrei's patch for caching WSDL in process memory, added TTL and
LIMIT for memory cache.
Memory cache is disblead by fefault because it is experemental and isn't
tested enough. It can be enabled whit configuartion directive soap.wsdl_cache
= WSDL_CACHE_MEMORY or soap.wsdl_cache = WSDL_CACHE_BOTH or derectly in
SoapClent/Soa
pServer constructor: $ws = new SoapClient($wsdl,
array(cache_wsdl=WSDL_CACHE_BOTH))
Disk and memory caches use the same TTL value - soap.wsdl_cache_ttl.
Configuration directive soap.wsdl_cache_limit restricts the number of
cached w
sdl files in memory. Adding new files into full memory cache will delete
oldest files from it.
Note that, each PHP process or thread uses it's own memory cache.
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.99r2=1.100diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.99 php-src/ext/soap/php_sdl.c:1.100
--- php-src/ext/soap/php_sdl.c:1.99 Tue Apr 18 13:08:11 2006
+++ php-src/ext/soap/php_sdl.c Wed Apr 19 10:49:16 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.99 2006/04/18 13:08:11 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.100 2006/04/19 10:49:16 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -1417,7 +1417,7 @@
return ht;
}
-static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t
TSRMLS_DC)
+static sdlPtr get_sdl_from_cache(const char *fn, const char *uri, time_t t,
time_t *cached TSRMLS_DC)
{
sdlPtr sdl;
time_t old_t;
@@ -1461,6 +1461,7 @@
efree(buf);
return NULL;
}
+ *cached = old_t;
WSDL_CACHE_GET_INT(i, in);
if (i == 0 strncmp(in, uri, i) != 0) {
@@ -3027,29 +3028,109 @@
return psdl;
}
-sdlPtr get_sdl(zval *this_ptr, char *uri, zend_bool persistent TSRMLS_DC)
+typedef struct _sdl_cache_bucket {
+ sdlPtr sdl;
+ time_t time;
+} sdl_cache_bucket;
+
+static void delete_psdl(void *data)
+{
+ sdl_cache_bucket *p = (sdl_cache_bucket*)data;
+ sdlPtr tmp = p-sdl;
+
+ zend_hash_destroy(tmp-functions);
+ if (tmp-source) {
+ free(tmp-source);
+ }
+ if (tmp-target_ns) {
+ free(tmp-target_ns);
+ }
+ if (tmp-elements) {
+ zend_hash_destroy(tmp-elements);
+ free(tmp-elements);
+ }
+ if (tmp-encoders) {
+ zend_hash_destroy(tmp-encoders);
+ free(tmp-encoders);
+ }
+ if (tmp-types) {
+ zend_hash_destroy(tmp-types);
+ free(tmp-types);
+ }
+ if (tmp-groups) {
+ zend_hash_destroy(tmp-groups);
+ free(tmp-groups);
+ }
+ if (tmp-bindings) {
+ zend_hash_destroy(tmp-bindings);
+ free(tmp-bindings);
+ }
+ if (tmp-requests) {
+ zend_hash_destroy(tmp-requests);
+ free(tmp-requests);
+ }
+ free(tmp);
+}
+
+sdlPtr get_sdl(zval *this_ptr, char *uri, long cache_wsdl TSRMLS_DC)
{
+ char fn[MAXPATHLEN];
sdlPtr sdl = NULL;
char* old_error_code = SOAP_GLOBAL(error_code);
- int uri_len;
+ int uri_len = 0;
php_stream_context *context=NULL;
zval **tmp, **proxy_host, **proxy_port, *orig_context = NULL,
*new_context = NULL;
smart_str headers = {0};
- char *pkey = NULL;
- int plen;
+ char* key = NULL;
+ time_t t = time(0);
+
+ if (strchr(uri,':') != NULL || IS_ABSOLUTE_PATH(uri, uri_len)) {
+ uri_len = strlen(uri);
+ } else if (VCWD_REALPATH(uri, fn) == NULL) {
+ cache_wsdl = WSDL_CACHE_NONE;
+ } else {
+ uri = fn;
+ uri_len = strlen(uri);
+ }
- if (persistent) {
- zend_rsrc_list_entry *le_ptr;
+ if ((cache_wsdl WSDL_CACHE_MEMORY) SOAP_GLOBAL(mem_cache)) {
+ sdl_cache_bucket *p;
- plen = spprintf(pkey, 0, SOAP:WSDL:%s, uri);
- if (SUCCESS == zend_hash_find(EG(persistent_list), pkey,
plen+1, (void*)le_ptr)) {
- if (Z_TYPE_P(le_ptr) == php_soap_psdl_list_entry()) {
- efree(pkey);
- return (sdlPtr)le_ptr-ptr;
+ if (SUCCESS == zend_hash_find(SOAP_GLOBAL(mem_cache), uri,
uri_len+1, (void*)p)) {
+ if (p-time t - SOAP_GLOBAL(cache_ttl)) {
+ /* in-memory cache entry is expired */
+
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / configure.in /main php_version.h
Ilia Alshanetsky wrote: iliaa Tue Apr 18 23:47:10 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/main php_version.h /php-src configure.in Log: Restore dev so win32 snaps can build Win32 snaps builds fine with any version string, thankyouverymuch. Edin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy php_tidy.def
johnWed Apr 19 20:37:55 2006 UTC Modified files: /php-src/ext/tidy php_tidy.def Log: Fixing static build in windoze http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/php_tidy.def?r1=1.2r2=1.3diff_format=u Index: php-src/ext/tidy/php_tidy.def diff -u php-src/ext/tidy/php_tidy.def:1.2 php-src/ext/tidy/php_tidy.def:1.3 --- php-src/ext/tidy/php_tidy.def:1.2 Mon Apr 25 20:46:16 2005 +++ php-src/ext/tidy/php_tidy.def Wed Apr 19 20:37:55 2006 @@ -45,7 +45,6 @@ tidyOptGetDefault tidyOptGetDefaultInt tidyOptGetDefaultBool -tidyOptGetDoc tidyOptGetPickList tidyOptGetNextPick tidyOptGetValue -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Wed Apr 19 20:53:54 2006 UTC Modified files: /CVSROOTavail Log: - Give nuno access to pecl/tidy http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1121r2=1.1122diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1121 CVSROOT/avail:1.1122 --- CVSROOT/avail:1.1121Mon Apr 17 21:34:47 2006 +++ CVSROOT/avail Wed Apr 19 20:53:54 2006 @@ -331,6 +331,7 @@ avail|ehlersd|pear/Net_Geo avail|lyaish|pear/HTML_AJAX avail|amir|pear/XML_XUL +avail|nlopess|pecl/tidy # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Wed Apr 19 20:54:30 2006 UTC Modified files: /CVSROOTavail Log: - And ext/tidy too as it's a symlink http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1122r2=1.1123diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1122 CVSROOT/avail:1.1123 --- CVSROOT/avail:1.1122Wed Apr 19 20:53:54 2006 +++ CVSROOT/avail Wed Apr 19 20:54:30 2006 @@ -331,7 +331,7 @@ avail|ehlersd|pear/Net_Geo avail|lyaish|pear/HTML_AJAX avail|amir|pear/XML_XUL -avail|nlopess|pecl/tidy +avail|nlopess|pecl/tidy,ext/tidy # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/tidy php_tidy.def
johnWed Apr 19 20:57:30 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/tidy php_tidy.def Log: Fixing static builds on windoze machines for our current lib version http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/php_tidy.def?r1=1.2r2=1.2.2.1diff_format=u Index: php-src/ext/tidy/php_tidy.def diff -u php-src/ext/tidy/php_tidy.def:1.2 php-src/ext/tidy/php_tidy.def:1.2.2.1 --- php-src/ext/tidy/php_tidy.def:1.2 Mon Apr 25 20:46:16 2005 +++ php-src/ext/tidy/php_tidy.def Wed Apr 19 20:57:30 2006 @@ -45,7 +45,6 @@ tidyOptGetDefault tidyOptGetDefaultInt tidyOptGetDefaultBool -tidyOptGetDoc tidyOptGetPickList tidyOptGetNextPick tidyOptGetValue -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / avail
Thanks Derick for your kindness :) Below you forgot to prepend php-src/ to ext/tidy. Thanks, Nuno derick Wed Apr 19 20:54:30 2006 UTC Modified files: /CVSROOT avail Log: - And ext/tidy too as it's a symlink http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1122r2=1.1123diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1122 CVSROOT/avail:1.1123 --- CVSROOT/avail:1.1122 Wed Apr 19 20:53:54 2006 +++ CVSROOT/avail Wed Apr 19 20:54:30 2006 @@ -331,7 +331,7 @@ avail|ehlersd|pear/Net_Geo avail|lyaish|pear/HTML_AJAX avail|amir|pear/XML_XUL -avail|nlopess|pecl/tidy +avail|nlopess|pecl/tidy,ext/tidy # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Wed Apr 19 21:42:21 2006 UTC Modified files: /CVSROOTavail Log: - Added php-src to the ext... so that it actually works. http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1123r2=1.1124diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1123 CVSROOT/avail:1.1124 --- CVSROOT/avail:1.1123Wed Apr 19 20:54:30 2006 +++ CVSROOT/avail Wed Apr 19 21:42:21 2006 @@ -331,7 +331,7 @@ avail|ehlersd|pear/Net_Geo avail|lyaish|pear/HTML_AJAX avail|amir|pear/XML_XUL -avail|nlopess|pecl/tidy,ext/tidy +avail|nlopess|pecl/tidy,php-src/ext/tidy # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / avail
On Wed, 19 Apr 2006, Nuno Lopes wrote: Below you forgot to prepend php-src/ to ext/tidy. Oops, fixed. Derick -- 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/tidy tidy.c
nlopess Wed Apr 19 21:47:20 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/tidy tidy.c
Log:
fix build with newer libtidy versions on windows
# first commit on php-src. whatch out :)
http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.7r2=1.66.2.8diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.7 php-src/ext/tidy/tidy.c:1.66.2.8
--- php-src/ext/tidy/tidy.c:1.66.2.7Mon Apr 3 14:59:30 2006
+++ php-src/ext/tidy/tidy.c Wed Apr 19 21:47:20 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.66.2.7 2006/04/03 14:59:30 tony2001 Exp $ */
+/* $Id: tidy.c,v 1.66.2.8 2006/04/19 21:47:20 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -37,6 +37,11 @@
#include tidy.h
#include buffio.h
+/* compatibility with older versions of libtidy */
+#ifndef TIDY_CALL
+#define TIDY_CALL
+#endif
+
#define PHP_TIDY_MODULE_VERSION2.0
/* {{{ ext/tidy macros
@@ -333,22 +338,22 @@
ZEND_GET_MODULE(tidy)
#endif
-void *php_tidy_malloc(size_t len)
+void* TIDY_CALL php_tidy_malloc(size_t len)
{
return emalloc(len);
}
-void *php_tidy_realloc(void *buf, size_t len)
+void* TIDY_CALL php_tidy_realloc(void *buf, size_t len)
{
return erealloc(buf, len);
}
-void php_tidy_free(void *buf)
+void TIDY_CALL php_tidy_free(void *buf)
{
efree(buf);
}
-void php_tidy_panic(ctmbstr msg)
+void TIDY_CALL php_tidy_panic(ctmbstr msg)
{
TSRMLS_FETCH();
php_error_docref(NULL TSRMLS_CC, E_ERROR, Could not allocate memory
for tidy! (Reason: %s), (char *)msg);
@@ -1000,7 +1005,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Tidy support, enabled);
php_info_print_table_row(2, libTidy Release, (char
*)tidyReleaseDate());
- php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.66.2.7 2006/04/03 14:59:30 tony2001
Exp $));
+ php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.66.2.8 2006/04/19 21:47:20 nlopess
Exp $));
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy tidy.c
nlopess Wed Apr 19 22:10:44 2006 UTC
Modified files:
/php-src/ext/tidy tidy.c
Log:
MFB: fix build with newer libtidy versions on windows
http://cvs.php.net/viewcvs.cgi/php-src/ext/tidy/tidy.c?r1=1.78r2=1.79diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.78 php-src/ext/tidy/tidy.c:1.79
--- php-src/ext/tidy/tidy.c:1.78Wed Mar 29 15:08:52 2006
+++ php-src/ext/tidy/tidy.c Wed Apr 19 22:10:44 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.78 2006/03/29 15:08:52 tony2001 Exp $ */
+/* $Id: tidy.c,v 1.79 2006/04/19 22:10:44 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,6 +36,11 @@
#include tidy.h
#include buffio.h
+/* compatibility with older versions of libtidy */
+#ifndef TIDY_CALL
+#define TIDY_CALL
+#endif
+
#define PHP_TIDY_MODULE_VERSION2.0
/* {{{ ext/tidy macros
@@ -333,22 +338,22 @@
ZEND_GET_MODULE(tidy)
#endif
-void *php_tidy_malloc(size_t len)
+void* TIDY_CALL php_tidy_malloc(size_t len)
{
return emalloc(len);
}
-void *php_tidy_realloc(void *buf, size_t len)
+void* TIDY_CALL php_tidy_realloc(void *buf, size_t len)
{
return erealloc(buf, len);
}
-void php_tidy_free(void *buf)
+void TIDY_CALL php_tidy_free(void *buf)
{
efree(buf);
}
-void php_tidy_panic(ctmbstr msg)
+void TIDY_CALL php_tidy_panic(ctmbstr msg)
{
TSRMLS_FETCH();
php_error_docref(NULL TSRMLS_CC, E_ERROR, Could not allocate memory
for tidy! (Reason: %s), (char *)msg);
@@ -980,7 +985,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Tidy support, enabled);
php_info_print_table_row(2, libTidy Release, (char
*)tidyReleaseDate());
- php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.78 2006/03/29 15:08:52 tony2001 Exp
$));
+ php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.79 2006/04/19 22:10:44 nlopess Exp
$));
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: CVSROOT / avail
On Wed, 19 Apr 2006, Nuno Lopes wrote: Below you forgot to prepend php-src/ to ext/tidy. Oops, fixed. Derick thanks! its working now. Nuno -- 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/tokenizer/tests 002.phpt 003.phpt bug26463.phpt
iliaa Thu Apr 20 01:06:58 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/tokenizer/tests002.phpt 003.phpt bug26463.phpt
Log:
Fixed tokenizer tests
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/002.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/tokenizer/tests/002.phpt
diff -u php-src/ext/tokenizer/tests/002.phpt:1.1.2.3
php-src/ext/tokenizer/tests/002.phpt:1.1.2.4
--- php-src/ext/tokenizer/tests/002.phpt:1.1.2.3Wed Jan 4 10:31:58 2006
+++ php-src/ext/tokenizer/tests/002.phptThu Apr 20 01:06:58 2006
@@ -21,40 +21,40 @@
echo Done\n;
?
---EXPECT--
+--EXPECTF--
array(49) {
[0]=
array(2) {
[0]=
-int(367)
+int(%d)
[1]=
string(2) ?
}
[1]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[2]=
array(2) {
[0]=
-int(316)
+int(%d)
[1]=
string(4) echo
}
[3]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[4]=
array(2) {
[0]=
-int(305)
+int(%d)
[1]=
string(1) 1
}
@@ -63,21 +63,21 @@
[6]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[7]=
array(2) {
[0]=
-int(301)
+int(%d)
[1]=
string(2) if
}
[8]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
@@ -86,7 +86,7 @@
[10]=
array(2) {
[0]=
-int(349)
+int(%d)
[1]=
string(5) isset
}
@@ -95,7 +95,7 @@
[12]=
array(2) {
[0]=
-int(309)
+int(%d)
[1]=
string(2) $a
}
@@ -106,28 +106,28 @@
[15]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[16]=
array(2) {
[0]=
-int(266)
+int(%d)
[1]=
string(5) print
}
[17]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[18]=
array(2) {
[0]=
-int(309)
+int(%d)
[1]=
string(2) $a
}
@@ -136,7 +136,7 @@
[20]=
array(2) {
[0]=
-int(305)
+int(%d)
[1]=
string(1) 1
}
@@ -145,21 +145,21 @@
[22]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[23]=
array(2) {
[0]=
-int(309)
+int(%d)
[1]=
string(2) $a
}
[24]=
array(2) {
[0]=
-int(297)
+int(%d)
[1]=
string(2) ++
}
@@ -168,21 +168,21 @@
[26]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[27]=
array(2) {
[0]=
-int(309)
+int(%d)
[1]=
string(2) $a
}
[28]=
array(2) {
[0]=
-int(296)
+int(%d)
[1]=
string(2) --
}
@@ -191,42 +191,42 @@
[30]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[31]=
array(2) {
[0]=
-int(309)
+int(%d)
[1]=
string(2) $a
}
[32]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[33]=
array(2) {
[0]=
-int(283)
+int(%d)
[1]=
string(2) ==
}
[34]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[35]=
array(2) {
[0]=
-int(305)
+int(%d)
[1]=
string(1) 2
}
@@ -235,42 +235,42 @@
[37]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[38]=
array(2) {
[0]=
-int(309)
+int(%d)
[1]=
string(2) $a
}
[39]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[40]=
array(2) {
[0]=
-int(281)
+int(%d)
[1]=
string(3) ===
}
[41]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[42]=
array(2) {
[0]=
-int(305)
+int(%d)
[1]=
string(1) 2
}
@@ -279,14 +279,14 @@
[44]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[45]=
array(2) {
[0]=
-int(304)
+int(%d)
[1]=
string(5) endif
}
@@ -295,14 +295,14 @@
[47]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[48]=
array(2) {
[0]=
-int(369)
+int(%d)
[1]=
string(2) ?
}
@@ -311,14 +311,14 @@
[0]=
array(2) {
[0]=
-int(367)
+int(%d)
[1]=
string(6) ?php
}
[1]=
array(2) {
[0]=
-int(327)
+int(%d)
[1]=
string(6) switch
}
@@ -327,7 +327,7 @@
[3]=
array(2) {
[0]=
-int(309)
+int(%d)
[1]=
string(2) $a
}
@@ -336,7 +336,7 @@
[5]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
@@ -345,28 +345,28 @@
[7]=
array(2) {
[0]=
-int(370)
+int(%d)
[1]=
string(1)
}
[8]=
array(2) {
[0]=
-int(329)
+int(%d)
[1]=
string(4) case
}
[9]=
[PHP-CVS] cvs: php-src /ext/unicode config.w32
fmk Thu Apr 20 03:41:33 2006 UTC
Modified files:
/php-src/ext/unicodeconfig.w32
Log:
fix build on Win32
http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/config.w32?r1=1.7r2=1.8diff_format=u
Index: php-src/ext/unicode/config.w32
diff -u php-src/ext/unicode/config.w32:1.7 php-src/ext/unicode/config.w32:1.8
--- php-src/ext/unicode/config.w32:1.7 Wed Mar 29 01:20:43 2006
+++ php-src/ext/unicode/config.w32 Thu Apr 20 03:41:33 2006
@@ -1,5 +1,5 @@
-// $Id: config.w32,v 1.7 2006/03/29 01:20:43 pollita Exp $
-// vim:ft=javascript
-
-EXTENSION(unicode, unicode.c unicode_iterators.c collator.c locale.c);
-AC_DEFINE('HAVE_UNICODE', 1, 'ICU API extension');
+// $Id: config.w32,v 1.8 2006/04/20 03:41:33 fmk Exp $
+// vim:ft=javascript
+
+EXTENSION(unicode, unicode.c unicode_iterators.c collator.c locale.c,
false);
+AC_DEFINE('HAVE_UNICODE', 1, 'ICU API extension');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
