[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Apr 18 05:31:46 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2318r2=1.2319diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2318 php-src/ChangeLog:1.2319 --- php-src/ChangeLog:1.2318Mon Apr 17 05:31:44 2006 +++ php-src/ChangeLog Tue Apr 18 05:31:45 2006 @@ -1,3 +1,42 @@ +2006-04-17 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/session/mod_files.c: + MFB51: Fixed Bug #36872 (session_destroy() fails after call to + session_regenerate_id(true)). + +* (PHP_4_4) + ext/session/mod_files.c: + MFH: Fixed Bug #36872 (session_destroy() fails after call to + session_regenerate_id(true)). + +* (PHP_5_1) + NEWS: + Fixed Bug #36872 (session_destroy() fails after call to + + session_regenerate_id(true)). + +2006-04-17 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS: + BFN + +* (PHP_5_1) + ext/mbstring/config.m4: + MFH: Fixed bug #37103 (libmbfl headers not installed) + +* ext/mbstring/config.m4: + Fixed bug #37103 (libmbfl headers not installed) + +2006-04-17 Sara Golemon [EMAIL PROTECTED] + +* (PHP_5_1) + ext/standard/filters.c: + MFH(r-1.55) Fix 'soft line break' handling in + convert.quoted-printable-decode + +* ext/standard/filters.c: + Fix 'soft line break' handling in convert.quoted-printable-decode + 2006-04-16 Ilia Alshanetsky [EMAIL PROTECTED] * ext/standard/http_fopen_wrapper.c:
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/soap php_sdl.c
dmitry Mon Apr 17 13:16:03 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/soap php_sdl.c
Log:
Fixed several bugs in new caching WSDL in memory code
Re-enabled disk cache
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.8r2=1.88.2.9diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.8 php-src/ext/soap/php_sdl.c:1.88.2.9
--- php-src/ext/soap/php_sdl.c:1.88.2.8 Mon Apr 10 10:11:06 2006
+++ php-src/ext/soap/php_sdl.c Mon Apr 17 13:16:02 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.8 2006/04/10 10:11:06 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.9 2006/04/17 13:16:02 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -2269,7 +2269,7 @@
sdlRestrictionIntPtr *rest = (sdlRestrictionIntPtr *)data;
sdlRestrictionIntPtr prest = NULL;
- prest = malloc(sizeof(sdlRestrictionIntPtr));
+ prest = malloc(sizeof(sdlRestrictionInt));
*prest = **rest;
*rest = prest;
}
@@ -2843,8 +2843,12 @@
psdl = malloc(sizeof(*sdl));
memset(psdl, 0, sizeof(*sdl));
- psdl-source = strdup(sdl-source);
- psdl-target_ns = strdup(sdl-target_ns);
+ if (sdl-source) {
+ psdl-source = strdup(sdl-source);
+ }
+ if (sdl-target_ns) {
+ psdl-target_ns = strdup(sdl-target_ns);
+ }
if (sdl-groups) {
sdlTypePtr *tmp;
@@ -3026,6 +3030,20 @@
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;
+
+ if (persistent) {
+ zend_rsrc_list_entry *le_ptr;
+
+ 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(Z_OBJPROP_P(this_ptr),
_stream_context, sizeof(_stream_context),
(void**)tmp)) {
@@ -3090,7 +3108,6 @@
SOAP_GLOBAL(error_code) = WSDL;
-#if 0
if (SOAP_GLOBAL(cache_enabled) ((uri_len = strlen(uri))
MAXPATHLEN)) {
char fn[MAXPATHLEN];
@@ -3128,26 +3145,21 @@
} else {
sdl = load_wsdl(this_ptr, uri TSRMLS_CC);
}
-#endif
+
+ if (sdl) {
+ sdl-is_persistent = 0;
+ }
if (persistent) {
- char *hashkey = NULL;
- int plen;
- zend_rsrc_list_entry le, *le_ptr;
+ if (sdl) {
+ zend_rsrc_list_entry le;
+ sdlPtr psdl = make_persistent_sdl(sdl TSRMLS_CC);
- plen = spprintf(hashkey, 0, SOAP:WSDL:%s, uri);
- if (SUCCESS == zend_hash_find(EG(persistent_list), hashkey,
plen+1, (void*)le_ptr)) {
- if (Z_TYPE_P(le_ptr) == php_soap_psdl_list_entry()) {
- sdl = (sdlPtr)le_ptr-ptr;
- }
- } else {
- sdlPtr psdl = NULL;
- sdl = load_wsdl(this_ptr, uri TSRMLS_CC);
- psdl = make_persistent_sdl(sdl TSRMLS_CC);
psdl-is_persistent = 1;
le.type = php_soap_psdl_list_entry();
le.ptr = psdl;
- if (SUCCESS == zend_hash_update(EG(persistent_list),
hashkey,
+ le.refcount = 0;
+ if (SUCCESS == zend_hash_update(EG(persistent_list),
pkey,
plen+1, (void*)le, sizeof(le), NULL)) {
/* remove non-persitent sdl structure */
delete_sdl_impl(sdl);
@@ -3156,14 +3168,11 @@
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Failed to register persistent entry);
/* clean up persistent sdl */
- delete_psdl(le_ptr TSRMLS_CC);
+ delete_psdl(le TSRMLS_CC);
/* keep non-persistent sdl and return it */
}
}
- efree(hashkey);
- } else {
- sdl = load_wsdl(this_ptr, uri TSRMLS_CC);
- sdl-is_persistent = 0;
+ efree(pkey);
}
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c
dmitry Mon Apr 17 13:16:15 2006 UTC
Modified files:
/php-src/ext/soap php_sdl.c
Log:
Fixed several bugs in new caching WSDL in memory code
Re-enabled disk cache
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.96r2=1.97diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.96 php-src/ext/soap/php_sdl.c:1.97
--- php-src/ext/soap/php_sdl.c:1.96 Mon Apr 10 10:11:29 2006
+++ php-src/ext/soap/php_sdl.c Mon Apr 17 13:16:15 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.96 2006/04/10 10:11:29 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.97 2006/04/17 13:16:15 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -2269,7 +2269,7 @@
sdlRestrictionIntPtr *rest = (sdlRestrictionIntPtr *)data;
sdlRestrictionIntPtr prest = NULL;
- prest = malloc(sizeof(sdlRestrictionIntPtr));
+ prest = malloc(sizeof(sdlRestrictionInt));
*prest = **rest;
*rest = prest;
}
@@ -2843,8 +2843,12 @@
psdl = malloc(sizeof(*sdl));
memset(psdl, 0, sizeof(*sdl));
- psdl-source = strdup(sdl-source);
- psdl-target_ns = strdup(sdl-target_ns);
+ if (sdl-source) {
+ psdl-source = strdup(sdl-source);
+ }
+ if (sdl-target_ns) {
+ psdl-target_ns = strdup(sdl-target_ns);
+ }
if (sdl-groups) {
sdlTypePtr *tmp;
@@ -3026,6 +3030,20 @@
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;
+
+ if (persistent) {
+ zend_rsrc_list_entry *le_ptr;
+
+ 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(Z_OBJPROP_P(this_ptr),
_stream_context, sizeof(_stream_context),
(void**)tmp)) {
@@ -3090,7 +3108,6 @@
SOAP_GLOBAL(error_code) = WSDL;
-#if 0
if (SOAP_GLOBAL(cache_enabled) ((uri_len = strlen(uri))
MAXPATHLEN)) {
char fn[MAXPATHLEN];
@@ -3128,26 +3145,21 @@
} else {
sdl = load_wsdl(this_ptr, uri TSRMLS_CC);
}
-#endif
+
+ if (sdl) {
+ sdl-is_persistent = 0;
+ }
if (persistent) {
- char *hashkey = NULL;
- int plen;
- zend_rsrc_list_entry le, *le_ptr;
+ if (sdl) {
+ zend_rsrc_list_entry le;
+ sdlPtr psdl = make_persistent_sdl(sdl TSRMLS_CC);
- plen = spprintf(hashkey, 0, SOAP:WSDL:%s, uri);
- if (SUCCESS == zend_hash_find(EG(persistent_list), hashkey,
plen+1, (void*)le_ptr)) {
- if (Z_TYPE_P(le_ptr) == php_soap_psdl_list_entry()) {
- sdl = (sdlPtr)le_ptr-ptr;
- }
- } else {
- sdlPtr psdl = NULL;
- sdl = load_wsdl(this_ptr, uri TSRMLS_CC);
- psdl = make_persistent_sdl(sdl TSRMLS_CC);
psdl-is_persistent = 1;
le.type = php_soap_psdl_list_entry();
le.ptr = psdl;
- if (SUCCESS == zend_hash_update(EG(persistent_list),
hashkey,
+ le.refcount = 0;
+ if (SUCCESS == zend_hash_update(EG(persistent_list),
pkey,
plen+1, (void*)le, sizeof(le), NULL)) {
/* remove non-persitent sdl structure */
delete_sdl_impl(sdl);
@@ -3156,14 +3168,11 @@
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Failed to register persistent entry);
/* clean up persistent sdl */
- delete_psdl(le_ptr TSRMLS_CC);
+ delete_psdl(le TSRMLS_CC);
/* keep non-persistent sdl and return it */
}
}
- efree(hashkey);
- } else {
- sdl = load_wsdl(this_ptr, uri TSRMLS_CC);
- sdl-is_persistent = 0;
+ efree(pkey);
}
SOAP_GLOBAL(error_code) = old_error_code;
--
PHP
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Apr 17 14:12:35 2006 UTC Modified files: /CVSROOTavail Log: - amir karma xml_xul http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1119r2=1.1120diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1119 CVSROOT/avail:1.1120 --- CVSROOT/avail:1.1119Tue Apr 11 20:15:18 2006 +++ CVSROOT/avail Mon Apr 17 14:12:35 2006 @@ -330,6 +330,8 @@ avail|makoto|pear/Services_Hatena avail|ehlersd|pear/Net_Geo avail|lyaish|pear/HTML_AJAX +avail|amir|pear/XML_XUL + # 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/soap php_encoding.c php_encoding.h php_sdl.c
andrei Mon Apr 17 16:08:08 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/soap php_encoding.c php_encoding.h php_sdl.c
Log:
Some encodings were assumed to be default and, thus, were not made
persistent.
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.20r2=1.103.2.21diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.20
php-src/ext/soap/php_encoding.c:1.103.2.21
--- php-src/ext/soap/php_encoding.c:1.103.2.20 Mon Apr 10 13:29:48 2006
+++ php-src/ext/soap/php_encoding.c Mon Apr 17 16:08:08 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.20 2006/04/10 13:29:48 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21 2006/04/17 16:08:08 andrei Exp $ */
#include time.h
@@ -211,6 +211,9 @@
{{END_KNOWN_TYPES, NULL, NULL, NULL}, guess_zval_convert,
guess_xml_convert}
};
+int numDefaultEncodings = sizeof(defaultEncoding)/sizeof(encode);
+
+
void whiteSpace_replace(char* str)
{
while (*str != '\0') {
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.h?r1=1.38.2.2r2=1.38.2.3diff_format=u
Index: php-src/ext/soap/php_encoding.h
diff -u php-src/ext/soap/php_encoding.h:1.38.2.2
php-src/ext/soap/php_encoding.h:1.38.2.3
--- php-src/ext/soap/php_encoding.h:1.38.2.2Sun Apr 9 23:35:51 2006
+++ php-src/ext/soap/php_encoding.h Mon Apr 17 16:08:08 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.h,v 1.38.2.2 2006/04/09 23:35:51 andrei Exp $ */
+/* $Id: php_encoding.h,v 1.38.2.3 2006/04/17 16:08:08 andrei Exp $ */
#ifndef PHP_ENCODING_H
#define PHP_ENCODING_H
@@ -222,5 +222,6 @@
void delete_encoder_persistent(void *handle);
extern encode defaultEncoding[];
+extern int numDefaultEncodings;
#endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.9r2=1.88.2.10diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.9 php-src/ext/soap/php_sdl.c:1.88.2.10
--- php-src/ext/soap/php_sdl.c:1.88.2.9 Mon Apr 17 13:16:02 2006
+++ php-src/ext/soap/php_sdl.c Mon Apr 17 16:08:08 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.9 2006/04/17 13:16:02 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.10 2006/04/17 16:08:08 andrei Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -2292,7 +2292,7 @@
{
sdlTypePtr *tmp;
- if (zend_hash_find(ptr_map, (char *)(*type), sizeof(sdlTypePtr),
(void**)tmp) == SUCCESS) {
+ if (zend_hash_find(ptr_map, (char *)type, sizeof(sdlTypePtr),
(void**)tmp) == SUCCESS) {
*type = *tmp;
} else {
zend_hash_next_index_insert(bp_types, (void*)type,
sizeof(sdlTypePtr*), NULL);
@@ -2305,11 +2305,11 @@
encodePtr *tmp;
/* do not process defaultEncoding's here */
- if ((*enc)-details.sdl_type == NULL) {
+ if ((*enc) = defaultEncoding (*enc) defaultEncoding +
numDefaultEncodings) {
return;
}
- if (zend_hash_find(ptr_map, (char *)(*enc), sizeof(encodePtr),
(void**)tmp) == SUCCESS) {
+ if (zend_hash_find(ptr_map, (char *)enc, sizeof(encodePtr),
(void**)tmp) == SUCCESS) {
*enc = *tmp;
} else {
zend_hash_next_index_insert(bp_encoders, (void*)enc,
sizeof(encodePtr*), NULL);
@@ -2513,7 +2513,7 @@
}
/* we do not want to process defaultEncoding's here */
- if (pattr-encode pattr-encode-details.sdl_type) {
+ if (pattr-encode) {
make_persistent_sdl_encoder_ref(pattr-encode, ptr_map,
bp_encoders);
}
@@ -2625,7 +2625,7 @@
}
/* we do not want to process defaultEncoding's here */
- if (ptype-encode ptype-encode-details.sdl_type) {
+ if (ptype-encode) {
make_persistent_sdl_encoder_ref(ptype-encode, ptr_map,
bp_encoders);
}
--
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_encoding.c php_encoding.h php_sdl.c
andrei Mon Apr 17 16:09:42 2006 UTC
Modified files:
/php-src/ext/soap php_encoding.c php_encoding.h php_sdl.c
Log:
MFB
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.125r2=1.126diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.125
php-src/ext/soap/php_encoding.c:1.126
--- php-src/ext/soap/php_encoding.c:1.125 Mon Apr 10 13:29:57 2006
+++ php-src/ext/soap/php_encoding.c Mon Apr 17 16:09:42 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.125 2006/04/10 13:29:57 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.126 2006/04/17 16:09:42 andrei Exp $ */
#include time.h
@@ -211,6 +211,9 @@
{{END_KNOWN_TYPES, NULL, NULL, NULL}, guess_zval_convert,
guess_xml_convert}
};
+int numDefaultEncodings = sizeof(defaultEncoding)/sizeof(encode);
+
+
void whiteSpace_replace(char* str)
{
while (*str != '\0') {
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.h?r1=1.40r2=1.41diff_format=u
Index: php-src/ext/soap/php_encoding.h
diff -u php-src/ext/soap/php_encoding.h:1.40
php-src/ext/soap/php_encoding.h:1.41
--- php-src/ext/soap/php_encoding.h:1.40Sun Apr 9 23:38:30 2006
+++ php-src/ext/soap/php_encoding.h Mon Apr 17 16:09:42 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.h,v 1.40 2006/04/09 23:38:30 andrei Exp $ */
+/* $Id: php_encoding.h,v 1.41 2006/04/17 16:09:42 andrei Exp $ */
#ifndef PHP_ENCODING_H
#define PHP_ENCODING_H
@@ -222,5 +222,6 @@
void delete_encoder_persistent(void *handle);
extern encode defaultEncoding[];
+extern int numDefaultEncodings;
#endif
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_sdl.c?r1=1.97r2=1.98diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.97 php-src/ext/soap/php_sdl.c:1.98
--- php-src/ext/soap/php_sdl.c:1.97 Mon Apr 17 13:16:15 2006
+++ php-src/ext/soap/php_sdl.c Mon Apr 17 16:09:42 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.97 2006/04/17 13:16:15 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.98 2006/04/17 16:09:42 andrei Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -2292,7 +2292,7 @@
{
sdlTypePtr *tmp;
- if (zend_hash_find(ptr_map, (char *)(*type), sizeof(sdlTypePtr),
(void**)tmp) == SUCCESS) {
+ if (zend_hash_find(ptr_map, (char *)type, sizeof(sdlTypePtr),
(void**)tmp) == SUCCESS) {
*type = *tmp;
} else {
zend_hash_next_index_insert(bp_types, (void*)type,
sizeof(sdlTypePtr*), NULL);
@@ -2305,11 +2305,11 @@
encodePtr *tmp;
/* do not process defaultEncoding's here */
- if ((*enc)-details.sdl_type == NULL) {
+ if ((*enc) = defaultEncoding (*enc) defaultEncoding +
numDefaultEncodings) {
return;
}
- if (zend_hash_find(ptr_map, (char *)(*enc), sizeof(encodePtr),
(void**)tmp) == SUCCESS) {
+ if (zend_hash_find(ptr_map, (char *)enc, sizeof(encodePtr),
(void**)tmp) == SUCCESS) {
*enc = *tmp;
} else {
zend_hash_next_index_insert(bp_encoders, (void*)enc,
sizeof(encodePtr*), NULL);
@@ -2513,7 +2513,7 @@
}
/* we do not want to process defaultEncoding's here */
- if (pattr-encode pattr-encode-details.sdl_type) {
+ if (pattr-encode) {
make_persistent_sdl_encoder_ref(pattr-encode, ptr_map,
bp_encoders);
}
@@ -2625,7 +2625,7 @@
}
/* we do not want to process defaultEncoding's here */
- if (ptype-encode ptype-encode-details.sdl_type) {
+ if (ptype-encode) {
make_persistent_sdl_encoder_ref(ptype-encode, ptr_map,
bp_encoders);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard filters.c
pollita Mon Apr 17 19:25:48 2006 UTC
Modified files:
/php-src/ext/standard filters.c
Log:
Fix 'soft line break' handling in convert.quoted-printable-decode
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filters.c?r1=1.54r2=1.55diff_format=u
Index: php-src/ext/standard/filters.c
diff -u php-src/ext/standard/filters.c:1.54 php-src/ext/standard/filters.c:1.55
--- php-src/ext/standard/filters.c:1.54 Mon Mar 20 20:09:20 2006
+++ php-src/ext/standard/filters.c Mon Apr 17 19:25:48 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: filters.c,v 1.54 2006/03/20 20:09:20 tony2001 Exp $ */
+/* $Id: filters.c,v 1.55 2006/04/17 19:25:48 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -1108,6 +1108,18 @@
scan_stat = 4;
ps++, icnt--;
break;
+ } else if (!inst-lbchars lb_cnt == 0 *ps
== '\r') {
+ /* auto-detect line endings, looks like
network line ending \r\n (could be mac \r) */
+ lb_cnt++;
+ scan_stat = 5;
+ ps++, icnt--;
+ break;
+ } else if (!inst-lbchars lb_cnt == 0 *ps
== '\n') {
+ /* auto-detect line endings, looks like
unix-lineendings, not to spec, but it is seem in the wild, a lot */
+ lb_cnt = lb_ptr = 0;
+ scan_stat = 0;
+ ps++, icnt--;
+ break;
} else if (lb_cnt inst-lbchars_len
*ps == (unsigned
char)inst-lbchars[lb_cnt]) {
lb_cnt++;
@@ -1165,7 +1177,16 @@
} break;
case 5: {
- if (lb_cnt = inst-lbchars_len) {
+ if (!inst-lbchars lb_cnt == 1 *ps ==
'\n') {
+ /* auto-detect soft line breaks, found
network line break */
+ lb_cnt = lb_ptr = 0;
+ scan_stat = 0;
+ ps++, icnt--; /* consume \n */
+ } else if (!inst-lbchars lb_cnt 0) {
+ /* auto-detect soft line breaks, found
mac line break */
+ lb_cnt = lb_ptr = 0;
+ scan_stat = 0;
+ } else if (lb_cnt = inst-lbchars_len) {
/* soft line break */
lb_cnt = lb_ptr = 0;
scan_stat = 0;
@@ -1486,10 +1507,6 @@
if (options != NULL) {
GET_STR_PROP(options, lbchars, lbchars_len,
line-break-chars, 0);
- if (lbchars == NULL) {
- lbchars = pestrdup(\r\n, 0);
- lbchars_len = 2;
- }
}
retval = pemalloc(sizeof(php_conv_qprint_decode),
persistent);
if (lbchars != NULL) {
--
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 filters.c
pollita Mon Apr 17 19:26:05 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard filters.c
Log:
MFH(r-1.55) Fix 'soft line break' handling in convert.quoted-printable-decode
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/filters.c?r1=1.44.2.5r2=1.44.2.6diff_format=u
Index: php-src/ext/standard/filters.c
diff -u php-src/ext/standard/filters.c:1.44.2.5
php-src/ext/standard/filters.c:1.44.2.6
--- php-src/ext/standard/filters.c:1.44.2.5 Wed Jan 18 23:55:47 2006
+++ php-src/ext/standard/filters.c Mon Apr 17 19:26:04 2006
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: filters.c,v 1.44.2.5 2006/01/18 23:55:47 tony2001 Exp $ */
+/* $Id: filters.c,v 1.44.2.6 2006/04/17 19:26:04 pollita Exp $ */
#include php.h
#include php_globals.h
@@ -1031,6 +1031,18 @@
scan_stat = 4;
ps++, icnt--;
break;
+ } else if (!inst-lbchars lb_cnt == 0 *ps
== '\r') {
+ /* auto-detect line endings, looks like
network line ending \r\n (could be mac \r) */
+ lb_cnt++;
+ scan_stat = 5;
+ ps++, icnt--;
+ break;
+ } else if (!inst-lbchars lb_cnt == 0 *ps
== '\n') {
+ /* auto-detect line endings, looks like
unix-lineendings, not to spec, but it is seem in the wild, a lot */
+ lb_cnt = lb_ptr = 0;
+ scan_stat = 0;
+ ps++, icnt--;
+ break;
} else if (lb_cnt inst-lbchars_len
*ps == (unsigned
char)inst-lbchars[lb_cnt]) {
lb_cnt++;
@@ -1088,7 +1100,16 @@
} break;
case 5: {
- if (lb_cnt = inst-lbchars_len) {
+ if (!inst-lbchars lb_cnt == 1 *ps ==
'\n') {
+ /* auto-detect soft line breaks, found
network line break */
+ lb_cnt = lb_ptr = 0;
+ scan_stat = 0;
+ ps++, icnt--; /* consume \n */
+ } else if (!inst-lbchars lb_cnt 0) {
+ /* auto-detect soft line breaks, found
mac line break */
+ lb_cnt = lb_ptr = 0;
+ scan_stat = 0;
+ } else if (lb_cnt = inst-lbchars_len) {
/* soft line break */
lb_cnt = lb_ptr = 0;
scan_stat = 0;
@@ -1408,12 +1429,10 @@
size_t lbchars_len;
if (options != NULL) {
+ /* If line-break-chars are not specified,
filter will attempt to detect line endings (\r, \n, or \r\n) */
GET_STR_PROP(options, lbchars, lbchars_len,
line-break-chars, 0);
- if (lbchars == NULL) {
- lbchars = pestrdup(\r\n, 0);
- lbchars_len = 2;
- }
}
+
retval = pemalloc(sizeof(php_conv_qprint_decode),
persistent);
if (lbchars != NULL) {
if
(php_conv_qprint_decode_ctor((php_conv_qprint_decode *)retval, lbchars,
lbchars_len, 1, persistent)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
pajoye Mon Apr 17 21:34:47 2006 UTC Modified files: /CVSROOTavail Log: - peardoc karma for olivierg http://cvs.php.net/viewcvs.cgi/CVSROOT/avail?r1=1.1120r2=1.1121diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1120 CVSROOT/avail:1.1121 --- CVSROOT/avail:1.1120Mon Apr 17 14:12:35 2006 +++ CVSROOT/avail Mon Apr 17 21:34:47 2006 @@ -247,7 +247,7 @@ avail|bjori|pear/Net_FTP,pear/Validate avail|cyberscribe|pear/Net_Monitor avail|mroch|pear/XML_RPC -avail|olivierg|pear/XML_Indexing,pear/Structures_DataGrid +avail|olivierg|peardoc,pear/XML_Indexing,pear/Structures_DataGrid avail|djg|peardoc,pear/File_XSPF,pear/File_Ogg avail|vincentlascaux|pear/File_Archive avail|mg|pecl/lzf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring config.m4
sniper Mon Apr 17 22:13:40 2006 UTC Modified files: /php-src/ext/mbstring config.m4 Log: Fixed bug #37103 (libmbfl headers not installed) http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/config.m4?r1=1.61r2=1.62diff_format=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.61 php-src/ext/mbstring/config.m4:1.62 --- php-src/ext/mbstring/config.m4:1.61 Thu Feb 23 20:15:36 2006 +++ php-src/ext/mbstring/config.m4 Mon Apr 17 22:13:39 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.61 2006/02/23 20:15:36 helly Exp $ +dnl $Id: config.m4,v 1.62 2006/04/17 22:13:39 sniper Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -283,7 +283,7 @@ dnl libmbfl is required PHP_MBSTRING_SETUP_LIBMBFL PHP_MBSTRING_EXTENSION - PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl libmbfl/mbfl]) + PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl/ libmbfl/mbfl]) fi # vim600: sts=2 sw=2 et -- 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/mbstring config.m4
sniper Mon Apr 17 22:13:56 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/mbstring config.m4 Log: MFH: Fixed bug #37103 (libmbfl headers not installed) http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.3r2=1.58.2.4diff_format=u Index: php-src/ext/mbstring/config.m4 diff -u php-src/ext/mbstring/config.m4:1.58.2.3 php-src/ext/mbstring/config.m4:1.58.2.4 --- php-src/ext/mbstring/config.m4:1.58.2.3 Fri Dec 23 15:18:52 2005 +++ php-src/ext/mbstring/config.m4 Mon Apr 17 22:13:56 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.58.2.3 2005/12/23 15:18:52 hirokawa Exp $ +dnl $Id: config.m4,v 1.58.2.4 2006/04/17 22:13:56 sniper Exp $ dnl AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [ @@ -293,7 +293,7 @@ dnl libmbfl is required PHP_MBSTRING_SETUP_LIBMBFL PHP_MBSTRING_EXTENSION - PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl libmbfl/mbfl]) + PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl/ libmbfl/mbfl]) fi # vim600: sts=2 sw=2 et -- 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
sniper Mon Apr 17 22:14:32 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: BFN http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.516r2=1.2027.2.517diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.516 php-src/NEWS:1.2027.2.517 --- php-src/NEWS:1.2027.2.516 Sun Apr 16 16:54:49 2006 +++ php-src/NEWSMon Apr 17 22:14:32 2006 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? Apr 2006, PHP 5.1.3 +- Fixed bug #37103 (libmbfl headers not installed). (Jani) - Fixed bug #37062 (compile failure on ARM architecture). (Tony) - Fixed bug #37061 (curl_exec() doesn't zero-terminate binary strings). (Tony) - Fixed bug #37060 (Type of retval of Countable::count() is not checked). -- 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
iliaa Mon Apr 17 23:28:02 2006 UTC Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: Fixed Bug #36872 (session_destroy() fails after call to + session_regenerate_id(true)). http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.517r2=1.2027.2.518diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.517 php-src/NEWS:1.2027.2.518 --- php-src/NEWS:1.2027.2.517 Mon Apr 17 22:14:32 2006 +++ php-src/NEWSMon Apr 17 23:28:02 2006 @@ -19,6 +19,8 @@ - Fixed bug #37045 (Fixed check for special chars for http redirects). (Ilia) - Fixed bug #37002 (Have to quote literals in INI when concatenating with vars). (Dmitry) +- Fixed Bug #36872 (session_destroy() fails after call to + session_regenerate_id(true)). (Ilia) - Fixed bug #36513 (comment will be outputed in last line). (Dmitry) 06 Apr 2006, PHP 5.1.3RC3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/session mod_files.c
iliaa Mon Apr 17 23:29:37 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/sessionmod_files.c
Log:
MFH: Fixed Bug #36872 (session_destroy() fails after call to
session_regenerate_id(true)).
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/mod_files.c?r1=1.83.2.9.2.2r2=1.83.2.9.2.3diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.83.2.9.2.2
php-src/ext/session/mod_files.c:1.83.2.9.2.3
--- php-src/ext/session/mod_files.c:1.83.2.9.2.2Sun Jan 1 13:46:56 2006
+++ php-src/ext/session/mod_files.c Mon Apr 17 23:29:37 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mod_files.c,v 1.83.2.9.2.2 2006/01/01 13:46:56 sniper Exp $ */
+/* $Id: mod_files.c,v 1.83.2.9.2.3 2006/04/17 23:29:37 iliaa Exp $ */
#include php.h
@@ -364,10 +364,12 @@
if (!ps_files_path_create(buf, sizeof(buf), data, key))
return FAILURE;
- ps_files_close(data);
+ if (data-fd != -1) {
+ ps_files_close(data);
- if (VCWD_UNLINK(buf) == -1) {
- return FAILURE;
+ if (VCWD_UNLINK(buf) == -1) {
+ return FAILURE;
+ }
}
return SUCCESS;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session mod_files.c
iliaa Mon Apr 17 23:29:46 2006 UTC
Modified files:
/php-src/ext/sessionmod_files.c
Log:
MFB51: Fixed Bug #36872 (session_destroy() fails after call to
session_regenerate_id(true)).
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/mod_files.c?r1=1.102r2=1.103diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.102
php-src/ext/session/mod_files.c:1.103
--- php-src/ext/session/mod_files.c:1.102 Sun Jan 1 13:09:53 2006
+++ php-src/ext/session/mod_files.c Mon Apr 17 23:29:46 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mod_files.c,v 1.102 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: mod_files.c,v 1.103 2006/04/17 23:29:46 iliaa Exp $ */
#include php.h
@@ -397,10 +397,12 @@
if (!ps_files_path_create(buf, sizeof(buf), data, key))
return FAILURE;
- ps_files_close(data);
+ if (data-fd != -1) {
+ ps_files_close(data);
- if (VCWD_UNLINK(buf) == -1) {
- return FAILURE;
+ if (VCWD_UNLINK(buf) == -1) {
+ return FAILURE;
+ }
}
return SUCCESS;
--
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/session mod_files.c
iliaa Tue Apr 18 00:31:45 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/sessionmod_files.c
Log:
Commit the actual fix
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/mod_files.c?r1=1.100.2.2r2=1.100.2.3diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.100.2.2
php-src/ext/session/mod_files.c:1.100.2.3
--- php-src/ext/session/mod_files.c:1.100.2.2 Sun Jan 1 12:50:12 2006
+++ php-src/ext/session/mod_files.c Tue Apr 18 00:31:45 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: mod_files.c,v 1.100.2.2 2006/01/01 12:50:12 sniper Exp $ */
+/* $Id: mod_files.c,v 1.100.2.3 2006/04/18 00:31:45 iliaa Exp $ */
#include php.h
@@ -397,10 +397,12 @@
if (!ps_files_path_create(buf, sizeof(buf), data, key))
return FAILURE;
- ps_files_close(data);
+ if (data-fd != -1) {
+ ps_files_close(data);
- if (VCWD_UNLINK(buf) == -1) {
- return FAILURE;
+ if (VCWD_UNLINK(buf) == -1) {
+ return FAILURE;
+ }
}
return SUCCESS;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
andrei Tue Apr 18 02:40:29 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
Fix trim(a) bug.
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.538r2=1.539diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.538 php-src/ext/standard/string.c:1.539
--- php-src/ext/standard/string.c:1.538 Mon Apr 3 09:14:50 2006
+++ php-src/ext/standard/string.c Tue Apr 18 02:40:29 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.538 2006/04/03 09:14:50 tony2001 Exp $ */
+/* $Id: string.c,v 1.539 2006/04/18 02:40:29 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -724,9 +724,7 @@
if ( u_isWhitespace(ch) == FALSE ) break;
}
}
- if ( i end ) {
- U16_BACK_1(c, 0, i); /* U16_NEXT() post-increments 'i'
*/
- }
+ U16_BACK_1(c, 0, i); /* U16_NEXT() post-increments 'i' */
start = i;
}
if ( mode 2 ) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
andrei Tue Apr 18 05:18:12 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
I'm not sure what the heck people were thinking here, but it should be
fixed finally. Please test.
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.539r2=1.540diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.539 php-src/ext/standard/string.c:1.540
--- php-src/ext/standard/string.c:1.539 Tue Apr 18 02:40:29 2006
+++ php-src/ext/standard/string.c Tue Apr 18 05:18:12 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.539 2006/04/18 02:40:29 andrei Exp $ */
+/* $Id: string.c,v 1.540 2006/04/18 05:18:12 andrei Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -721,10 +721,12 @@
}
if ( wh != ch ) break;
} else {
- if ( u_isWhitespace(ch) == FALSE ) break;
+ if ( u_isWhitespace(ch) == FALSE ) {
+ U16_BACK_1(c, 0, i); /* U16_NEXT()
post-increments 'i' */
+ break;
+ }
}
}
- U16_BACK_1(c, 0, i); /* U16_NEXT() post-increments 'i' */
start = i;
}
if ( mode 2 ) {
@@ -737,12 +739,13 @@
}
if ( wh != ch ) break;
} else {
- if ( u_isWhitespace(ch) == FALSE ) break;
+ if ( u_isWhitespace(ch) == FALSE ) {
+ U16_FWD_1(c, i, end); /* U16_PREV()
pre-decrements 'i' */
+ break;
+ }
}
}
end = i;
- } else {
- --end;
}
if ( what )
{
@@ -751,10 +754,10 @@
if ( start len ) {
if ( return_value ) {
- RETVAL_UNICODEL(c+start, end-start+1, 1);
+ RETVAL_UNICODEL(c+start, end-start, 1);
return NULL;
} else {
- return eustrndup(c+start, end-start+1);
+ return eustrndup(c+start, end-start);
}
} else { /* Trimmed the whole string */
if ( return_value ) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
