[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /sapi/apache mod_php5.c
tony2001Wed Feb 15 11:13:05 2006 UTC
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apachemod_php5.c
/php-srcNEWS
Log:
MFH: fix #36400 (Custom 5xx error does not return correct HTTP response error
code)
http://cvs.php.net/viewcvs.cgi/php-src/sapi/apache/mod_php5.c?r1=1.10.2.4r2=1.10.2.5diff_format=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.10.2.4
php-src/sapi/apache/mod_php5.c:1.10.2.5
--- php-src/sapi/apache/mod_php5.c:1.10.2.4 Mon Aug 1 08:12:42 2005
+++ php-src/sapi/apache/mod_php5.c Wed Feb 15 11:13:05 2006
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php5.c,v 1.10.2.4 2005/08/01 08:12:42 dmitry Exp $ */
+/* $Id: mod_php5.c,v 1.10.2.5 2006/02/15 11:13:05 tony2001 Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -67,6 +67,7 @@
/* ### these should be defined in mod_php5.h or somewhere else */
#define USE_PATH 1
#define IGNORE_URL 2
+#define MAX_STATUS_LENGTH sizeof( LONGEST POSSIBLE STATUS DESCRIPTION)
module MODULE_VAR_EXPORT php5_module;
@@ -208,17 +209,35 @@
static int sapi_apache_send_headers(sapi_headers_struct *sapi_headers
TSRMLS_DC)
{
request_rec *r = SG(server_context);
+ char *status_buf = NULL;
+ const char *sline = SG(sapi_headers).http_status_line;
+ int sline_len;
if(r == NULL) { /* server_context is not here anymore */
return SAPI_HEADER_SEND_FAILED;
}
r-status = SG(sapi_headers).http_response_code;
+
+ /* httpd requires that r-status_line is set to the first digit of
+* the status-code: */
+ if (sline ((sline_len = strlen(sline)) 12) strncmp(sline,
HTTP/1., 7) == 0 sline[8] == ' ' sline[12] == ' ') {
+ if ((sline_len - 9) MAX_STATUS_LENGTH) {
+ status_buf = estrndup(sline + 9, MAX_STATUS_LENGTH);
+ } else {
+ status_buf = estrndup(sline + 9, sline_len - 9);
+ }
+ r-status_line = status_buf;
+ }
+
if(r-status==304) {
send_error_response(r,0);
} else {
send_http_header(r);
- }
+ }
+ if (status_buf) {
+ efree(status_buf);
+ }
return SAPI_HEADER_SENT_SUCCESSFULLY;
}
/* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1760.2.532r2=1.1760.2.533diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.532 php-src/NEWS:1.1760.2.533
--- php-src/NEWS:1.1760.2.532 Mon Feb 13 12:18:48 2006
+++ php-src/NEWSWed Feb 15 11:13:05 2006
@@ -4,6 +4,8 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #36400 (Custom 5xx error does not return correct HTTP response
+ error code). (Tony)
- Fixed bug #36303 (foreach on error_zval produces segfault). (Dmitry)
- Fixed bug #36205 (Memory leaks on duplicate cookies). (Dmitry)
- Fixed bug #36071 (Engine Crash related with 'clone'). (Dmitry)
--
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) / NEWS /main php_variables.c
dmitry Mon Feb 13 12:18:48 2006 UTC
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/main php_variables.c
Log:
Fixed bug #36205 (Memory leaks on duplicate cookies)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1760.2.531r2=1.1760.2.532diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.531 php-src/NEWS:1.1760.2.532
--- php-src/NEWS:1.1760.2.531 Mon Feb 6 15:31:28 2006
+++ php-src/NEWSMon Feb 13 12:18:48 2006
@@ -5,6 +5,7 @@
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
- Fixed bug #36303 (foreach on error_zval produces segfault). (Dmitry)
+- Fixed bug #36205 (Memory leaks on duplicate cookies). (Dmitry)
- Fixed bug #36071 (Engine Crash related with 'clone'). (Dmitry)
- Fixed bug #36006 (Problem with $this in __destruct()). (Dmitry)
- Fixed bug #35612 (iis6 Access Violation crash). (Dmitry, alacn.uhahaa)
http://cvs.php.net/viewcvs.cgi/php-src/main/php_variables.c?r1=1.81.2.13r2=1.81.2.14diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.81.2.13
php-src/main/php_variables.c:1.81.2.14
--- php-src/main/php_variables.c:1.81.2.13 Wed Sep 28 22:35:42 2005
+++ php-src/main/php_variables.cMon Feb 13 12:18:48 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.81.2.13 2005/09/28 22:35:42 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.81.2.14 2006/02/13 12:18:48 dmitry Exp $ */
#include stdio.h
#include php.h
@@ -204,6 +204,7 @@
if (PG(http_globals)[TRACK_VARS_COOKIE]
symtable1 == Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE])
zend_symtable_find(symtable1,
escaped_index, index_len+1, (void **) tmp) != FAILURE) {
efree(escaped_index);
+ zval_ptr_dtor(gpc_element);
break;
}
zend_symtable_update(symtable1, escaped_index,
index_len+1, gpc_element, sizeof(zval *), (void **) gpc_element_p);
--
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) / NEWS /ext/soap php_http.c
dmitry Mon Dec 12 09:25:41 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap php_http.c
Log:
Fixed bug #35570 (segfault when re-using soap client object)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.1760.2.527r2=1.1760.2.528diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.527 php-src/NEWS:1.1760.2.528
--- php-src/NEWS:1.1760.2.527 Fri Dec 9 18:11:02 2005
+++ php-src/NEWSMon Dec 12 09:25:40 2005
@@ -5,6 +5,7 @@
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
- Fixed bug #35612 (iis6 Access Violation crash). (Dmitry, alacn.uhahaa)
+- Fixed bug #35570 (segfault when re-using soap client object). (Dmitry)
- FIxed bug #35536 (mysql_field_type() doesn't handle NEWDECIMAL). (Tony)
- Fixed bug #35437 (Segfault or Invalid Opcode 137/1/4). (Dmitry)
- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_http.c?r1=1.55.2.23r2=1.55.2.24diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.55.2.23
php-src/ext/soap/php_http.c:1.55.2.24
--- php-src/ext/soap/php_http.c:1.55.2.23 Wed Dec 7 13:56:07 2005
+++ php-src/ext/soap/php_http.c Mon Dec 12 09:25:40 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.55.2.23 2005/12/07 13:56:07 dmitry Exp $ */
+/* $Id: php_http.c,v 1.55.2.24 2005/12/12 09:25:40 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -32,7 +32,7 @@
static int stream_alive(php_stream *stream TSRMLS_DC)
{
- int socket;
+ long socket;
char buf;
/* maybe better to use:
--
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) / NEWS /sapi/cgi cgi_main.c
dmitry Fri Dec 9 12:02:13 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/sapi/cgi cgi_main.c
Log:
Fixed bug #34429 (Output buffering cannot be turned off with FastCGI)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.525r2=1.1760.2.526ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.525 php-src/NEWS:1.1760.2.526
--- php-src/NEWS:1.1760.2.525 Mon Dec 5 08:19:42 2005
+++ php-src/NEWSFri Dec 9 12:02:10 2005
@@ -55,6 +55,8 @@
- Fixed bug #34453 (parsing http://www.w3.org/2001/xml.xsd exception). (Dmitry)
- Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
+- Fixed bug #34429 (Output buffering cannot be turned off with FastCGI).
+ (Dmitry, Ilya)
- Fixed Bug #34243 (ReflectionClass::getDocComment() returns no result).
(Marcus)
- Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler).
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.256.2.7r2=1.256.2.8ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.256.2.7
php-src/sapi/cgi/cgi_main.c:1.256.2.8
--- php-src/sapi/cgi/cgi_main.c:1.256.2.7 Thu Oct 6 16:36:44 2005
+++ php-src/sapi/cgi/cgi_main.c Fri Dec 9 12:02:13 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.256.2.7 2005/10/06 20:36:44 johannes Exp $ */
+/* $Id: cgi_main.c,v 1.256.2.8 2005/12/09 17:02:13 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -1257,6 +1257,8 @@
running--;
}
}
+ } else {
+ parent = 0;
}
#endif /* WIN32 */
--
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) / NEWS /ext/mysql php_mysql.c
tony2001Mon Dec 5 08:19:44 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/ext/mysql php_mysql.c Log: MF51: fix #35536 (mysql_field_type() doesn't handle NEWDECIMAL) add also SET, ENUM, NEWDATE and GEOMETRY to the switch http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.524r2=1.1760.2.525ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.524 php-src/NEWS:1.1760.2.525 --- php-src/NEWS:1.1760.2.524 Thu Dec 1 07:56:01 2005 +++ php-src/NEWSMon Dec 5 08:19:42 2005 @@ -4,6 +4,7 @@ - Fixed an error in mysqli_fetch_fields (returned NULL instead of an array when row number field_count). (Georg) - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- FIxed bug #35536 (mysql_field_type() doesn't handle NEWDECIMAL). (Tony) - Fixed bug #35437 (Segfault or Invalid Opcode 137/1/4). (Dmitry) - Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of soapenc:base64binary fails). (Dmitry) http://cvs.php.net/diff.php/php-src/ext/mysql/php_mysql.c?r1=1.209.2.2r2=1.209.2.3ty=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.209.2.2 php-src/ext/mysql/php_mysql.c:1.209.2.3 --- php-src/ext/mysql/php_mysql.c:1.209.2.2 Thu Apr 7 18:23:28 2005 +++ php-src/ext/mysql/php_mysql.c Mon Dec 5 08:19:43 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: php_mysql.c,v 1.209.2.2 2005/04/07 22:23:28 sniper Exp $ */ +/* $Id: php_mysql.c,v 1.209.2.3 2005/12/05 13:19:43 tony2001 Exp $ */ /* TODO: * @@ -2175,6 +2175,9 @@ case FIELD_TYPE_FLOAT: case FIELD_TYPE_DOUBLE: case FIELD_TYPE_DECIMAL: +#ifdef FIELD_TYPE_NEWDECIMAL + case FIELD_TYPE_NEWDECIMAL: +#endif return real; break; case FIELD_TYPE_TIMESTAMP: @@ -2186,11 +2189,25 @@ break; #endif case FIELD_TYPE_DATE: +#ifdef FIELD_TYPE_NEWDATE + case FIELD_TYPE_NEWDATE: +#endif return date; break; case FIELD_TYPE_TIME: return time; break; + case FIELD_TYPE_SET: + return set; + break; + case FIELD_TYPE_ENUM: + return enum; + break; +#ifdef FIELD_TYPE_GEOMETRY + case FIELD_TYPE_GEOMETRY: + return geometry; + break; +#endif case FIELD_TYPE_DATETIME: return datetime; break; -- 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) / NEWS /ext/soap php_sdl.c
dmitry Mon Nov 28 05:07:57 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
soapenc:base64binary fails)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.522r2=1.1760.2.523ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.522 php-src/NEWS:1.1760.2.523
--- php-src/NEWS:1.1760.2.522 Thu Nov 24 06:33:26 2005
+++ php-src/NEWSMon Nov 28 05:07:51 2005
@@ -4,6 +4,8 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #35399 (Since fix of bug #35273 SOAP decoding of
+ soapenc:base64binary fails). (Dmitry)
- Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash).
(Dmitry)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.14r2=1.70.2.15ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.70.2.14
php-src/ext/soap/php_sdl.c:1.70.2.15
--- php-src/ext/soap/php_sdl.c:1.70.2.14Fri Nov 18 06:01:05 2005
+++ php-src/ext/soap/php_sdl.c Mon Nov 28 05:07:56 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.70.2.14 2005/11/18 11:01:05 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.70.2.15 2005/11/28 10:07:56 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -1289,6 +1289,40 @@
enc-details.sdl_type = types[i];
enc-to_xml = sdl_guess_convert_xml;
enc-to_zval = sdl_guess_convert_zval;
+
+ if (enc-details.sdl_type == NULL) {
+ int ns_len = strlen(enc-details.ns);
+ int type_len = strlen(enc-details.type_str);
+
+ if (((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1
+ memcmp(enc-details.ns, SOAP_1_1_ENC_NAMESPACE,
sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) ||
+(ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1
+ memcmp(enc-details.ns, SOAP_1_2_ENC_NAMESPACE,
sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) {
+ char *enc_nscat;
+ int enc_ns_len;
+ int enc_len;
+ encodePtr real_enc;
+
+ enc_ns_len = sizeof(XSD_NAMESPACE)-1;
+ enc_len = enc_ns_len + type_len + 1;
+ enc_nscat = emalloc(enc_len + 1);
+ memcpy(enc_nscat, XSD_NAMESPACE,
sizeof(XSD_NAMESPACE)-1);
+ enc_nscat[enc_ns_len] = ':';
+ memcpy(enc_nscat+enc_ns_len+1, enc-details.type_str,
type_len);
+ enc_nscat[enc_len] = '\0';
+
+ real_enc = get_encoder_ex(NULL, enc_nscat, enc_len);
+ efree(enc_nscat);
+ if (real_enc) {
+ enc-to_zval = real_enc-to_zval;
+ enc-to_xml = real_enc-to_xml;
+ enc-to_zval_before = real_enc-to_zval_before;
+ enc-to_xml_before = real_enc-to_xml_before;
+ enc-to_zval_after = real_enc-to_zval_after;
+ enc-to_xml_after = real_enc-to_xml_after;
+ }
+ }
+ }
}
static void sdl_deserialize_soap_body(sdlSoapBindingFunctionBodyPtr body,
encodePtr *encoders, sdlTypePtr *types, char **in)
--
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) / NEWS /ext/soap php_sdl.c /ext/soap/tests/bugs bug35273.phpt
dmitry Fri Nov 18 06:01:05 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/soap/tests/bugsbug35273.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #35273 (Error in mapping soap - java types)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.515r2=1.1760.2.516ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.515 php-src/NEWS:1.1760.2.516
--- php-src/NEWS:1.1760.2.515 Thu Nov 17 09:20:03 2005
+++ php-src/NEWSFri Nov 18 06:01:04 2005
@@ -4,6 +4,7 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
- Fixed bug #35239 (Objects can lose references). (Dmitry)
- Fixed bug #35229 (call_user_func() crashes when arguement_stack is nearly
full). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.13r2=1.70.2.14ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.70.2.13
php-src/ext/soap/php_sdl.c:1.70.2.14
--- php-src/ext/soap/php_sdl.c:1.70.2.13Mon Oct 24 03:45:49 2005
+++ php-src/ext/soap/php_sdl.c Fri Nov 18 06:01:05 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.70.2.13 2005/10/24 07:45:49 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.70.2.14 2005/11/18 11:01:05 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -117,24 +117,40 @@
nscat[len] = '\0';
enc = get_encoder_ex(sdl, nscat, len);
- efree(nscat);
if (enc == NULL
((ns_len == sizeof(SOAP_1_1_ENC_NAMESPACE)-1
memcmp(ns, SOAP_1_1_ENC_NAMESPACE,
sizeof(SOAP_1_1_ENC_NAMESPACE)-1) == 0) ||
(ns_len == sizeof(SOAP_1_2_ENC_NAMESPACE)-1
memcmp(ns, SOAP_1_2_ENC_NAMESPACE,
sizeof(SOAP_1_2_ENC_NAMESPACE)-1) == 0))) {
- ns_len = sizeof(XSD_NAMESPACE)-1;
- len = ns_len + type_len + 1;
- nscat = emalloc(len + 1);
- memcpy(nscat, XSD_NAMESPACE, sizeof(XSD_NAMESPACE)-1);
- nscat[ns_len] = ':';
- memcpy(nscat+ns_len+1, type, type_len);
- nscat[len] = '\0';
-
- enc = get_encoder_ex(sdl, nscat, len);
- efree(nscat);
+ char *enc_nscat;
+ int enc_ns_len;
+ int enc_len;
+
+ enc_ns_len = sizeof(XSD_NAMESPACE)-1;
+ enc_len = enc_ns_len + type_len + 1;
+ enc_nscat = emalloc(enc_len + 1);
+ memcpy(enc_nscat, XSD_NAMESPACE, sizeof(XSD_NAMESPACE)-1);
+ enc_nscat[enc_ns_len] = ':';
+ memcpy(enc_nscat+enc_ns_len+1, type, type_len);
+ enc_nscat[enc_len] = '\0';
+
+ enc = get_encoder_ex(NULL, enc_nscat, enc_len);
+ efree(enc_nscat);
+ if (enc sdl) {
+ encodePtr new_enc = emalloc(sizeof(encode));
+ memcpy(new_enc, enc, sizeof(encode));
+ new_enc-details.ns = estrndup(ns, ns_len);
+ new_enc-details.type_str =
estrdup(new_enc-details.type_str);
+ if (sdl-encoders == NULL) {
+ sdl-encoders = emalloc(sizeof(HashTable));
+ zend_hash_init(sdl-encoders, 0, NULL,
delete_encoder, 0);
+ }
+ zend_hash_update(sdl-encoders, nscat, len + 1,
new_enc, sizeof(encodePtr), NULL);
+ enc = new_enc;
+ }
}
+ efree(nscat);
return enc;
}
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug35273.phpt?r=1.1p=1
Index: php-src/ext/soap/tests/bugs/bug35273.phpt
+++ php-src/ext/soap/tests/bugs/bug35273.phpt
--TEST--
Bug #35273 Error in mapping soap - java types
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
class TestSoapClient extends SoapClient {
function __doRequest($request, $location, $action, $version) {
echo $request;
exit;
}
}
ini_set(soap.wsdl_cache_enabled, 0);
$client = new TestSoapClient(dirname(__FILE__).'/bug32941.wsdl', array(trace
= 1, 'exceptions' = 0));
$ahoj = $client-echoPerson(array(name=Name,surname=Surname));
echo ok\n;
?
--EXPECT--
?xml version=1.0 encoding=UTF-8?
SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://service;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
xmlns:ns2=urn:service.EchoService
xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 14:43:16 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33153 Crash in mssql_next_result().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.516r2=1.1760.2.517ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.516 php-src/NEWS:1.1760.2.517
--- php-src/NEWS:1.1760.2.516 Fri Nov 18 06:01:04 2005
+++ php-src/NEWSFri Nov 18 14:43:03 2005
@@ -58,6 +58,7 @@
- Fixed bug #33383 (crash when retrieving empty LOBs). (Tony)
- Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references).
(Tony)
- Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.11r2=1.137.2.12ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.11
php-src/ext/mssql/php_mssql.c:1.137.2.12
--- php-src/ext/mssql/php_mssql.c:1.137.2.11Wed Nov 16 13:24:30 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:43:15 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.11 2005/11/16 18:24:30 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.12 2005/11/18 19:43:15 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1835,6 +1835,11 @@
mssql_ptr = result-mssql_ptr;
retvalue = dbresults(mssql_ptr-link);
+
+ while (dbnumcols(mssql_ptr-link) = 0 retvalue == SUCCEED) {
+ retvalue = dbresults(mssql_ptr-link);
+ }
+
if (retvalue == FAIL) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/mssql php_mssql.c
Thanks again.
On 18.11.2005 22:43, Frank M. Kromann wrote:
fmk Fri Nov 18 14:43:16 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33153 Crash in mssql_next_result().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.516r2=1.1760.2.517ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.516 php-src/NEWS:1.1760.2.517
--- php-src/NEWS:1.1760.2.516 Fri Nov 18 06:01:04 2005
+++ php-src/NEWSFri Nov 18 14:43:03 2005
@@ -58,6 +58,7 @@
- Fixed bug #33383 (crash when retrieving empty LOBs). (Tony)
- Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references).
(Tony)
- Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.11r2=1.137.2.12ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.11
php-src/ext/mssql/php_mssql.c:1.137.2.12
--- php-src/ext/mssql/php_mssql.c:1.137.2.11Wed Nov 16 13:24:30 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:43:15 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.11 2005/11/16 18:24:30 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.12 2005/11/18 19:43:15 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1835,6 +1835,11 @@
mssql_ptr = result-mssql_ptr;
retvalue = dbresults(mssql_ptr-link);
+
+ while (dbnumcols(mssql_ptr-link) = 0 retvalue == SUCCEED) {
+ retvalue = dbresults(mssql_ptr-link);
+ }
+
if (retvalue == FAIL) {
RETURN_FALSE;
}
--
Wbr,
Antony Dovgal
--
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) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:41:03 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #32009 crash when mssql_bind() is called more than once
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.517r2=1.1760.2.518ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.517 php-src/NEWS:1.1760.2.518
--- php-src/NEWS:1.1760.2.517 Fri Nov 18 14:43:03 2005
+++ php-src/NEWSFri Nov 18 15:41:02 2005
@@ -59,6 +59,7 @@
- Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references).
(Tony)
- Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.12r2=1.137.2.13ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.12
php-src/ext/mssql/php_mssql.c:1.137.2.13
--- php-src/ext/mssql/php_mssql.c:1.137.2.12Fri Nov 18 14:43:15 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:41:03 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.12 2005/11/18 19:43:15 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.13 2005/11/18 20:41:03 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2083,17 +2083,22 @@
zend_hash_init(statement-binds, 13, NULL,
_mssql_bind_hash_dtor, 0);
}
- memset((void*)bind,0,sizeof(mssql_bind));
-
zend_hash_add(statement-binds,Z_STRVAL_PP(param_name),Z_STRLEN_PP(param_name),bind,sizeof(mssql_bind),(void
**)bindp);
- if( NULL == bindp ) RETURN_FALSE;
- bindp-zval=*var;
- zval_add_ref(var);
-
- /* no call to dbrpcparam if RETVAL */
- if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
- if (dbrpcparam(mssql_ptr-link, Z_STRVAL_PP(param_name),
(BYTE)status, type, maxlen, datalen, (LPBYTE)value)==FAIL) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Unable to
set parameter);
- RETURN_FALSE;
+ if (zend_hash_exists(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name))) {
+ RETURN_FALSE;
+ }
+ else {
+ memset((void*)bind,0,sizeof(mssql_bind));
+ zend_hash_add(statement-binds, Z_STRVAL_PP(param_name),
Z_STRLEN_PP(param_name), bind, sizeof(mssql_bind), (void **)bindp);
+ if( NULL == bindp ) RETURN_FALSE;
+ bindp-zval=*var;
+ zval_add_ref(var);
+
+ /* no call to dbrpcparam if RETVAL */
+ if ( strcmp(RETVAL,Z_STRVAL_PP(param_name))!=0 ) {
+ if (dbrpcparam(mssql_ptr-link,
Z_STRVAL_PP(param_name), (BYTE)status, type, maxlen, datalen,
(LPBYTE)value)==FAIL) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
Unable to set parameter);
+ RETURN_FALSE;
+ }
}
}
--
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) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:49:02 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH Fix #33963. mssql_bind fails on input parameters
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.518r2=1.1760.2.519ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.518 php-src/NEWS:1.1760.2.519
--- php-src/NEWS:1.1760.2.518 Fri Nov 18 15:41:02 2005
+++ php-src/NEWSFri Nov 18 15:49:00 2005
@@ -60,6 +60,7 @@
- Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
+- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.13r2=1.137.2.14ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.13
php-src/ext/mssql/php_mssql.c:1.137.2.14
--- php-src/ext/mssql/php_mssql.c:1.137.2.13Fri Nov 18 15:41:03 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:49:01 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.13 2005/11/18 20:41:03 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.14 2005/11/18 20:49:01 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2010,7 +2010,9 @@
type=Z_LVAL_PP(yytype);
is_output=Z_LVAL_PP(yyis_output);
is_null=Z_LVAL_PP(yyis_null);
- maxlen=Z_LVAL_PP(yymaxlen);
+ if (is_output) {
+ maxlen=Z_LVAL_PP(yymaxlen);
+ }
}
break;
--
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) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 16:23:46 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
MFH: Fix #33201 Crash when fetching some data types
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.519r2=1.1760.2.520ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.519 php-src/NEWS:1.1760.2.520
--- php-src/NEWS:1.1760.2.519 Fri Nov 18 15:49:00 2005
+++ php-src/NEWSFri Nov 18 16:23:45 2005
@@ -61,6 +61,7 @@
- Fixed bug #33153 (crash in mssql_next result). (Frank)
- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
- Fixed bug #33963 (mssql_bind() fails on input parameters). (Frank)
+- Fixed bug #33201 (Crash when fetching some data types). (Frank)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.137.2.14r2=1.137.2.15ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.137.2.14
php-src/ext/mssql/php_mssql.c:1.137.2.15
--- php-src/ext/mssql/php_mssql.c:1.137.2.14Fri Nov 18 15:49:01 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:23:45 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.137.2.14 2005/11/18 20:49:01 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.137.2.15 2005/11/18 21:23:45 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -865,11 +865,9 @@
if ((column_type != SQLDATETIME column_type
!= SQLDATETIM4) || MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -877,6 +875,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -935,11 +935,9 @@
if ((column_type != SQLDATETIME column_type != SQLDATETIM4)
|| MS_SQL_G(datetimeconvert)) {
switch (column_type) {
- case SQLDATETIM4 :
- res_length += 14;
- break;
case SQLDATETIME :
- res_length += 10;
+ case SQLDATETIM4 :
+ res_length += 20;
break;
case SQLMONEY :
case SQLMONEY4 :
@@ -947,6 +945,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
--
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) / NEWS /main/streams plain_wrapper.c
tony2001Thu Nov 17 09:20:04 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/main/streams plain_wrapper.c Log: MFH: fix #35079 (stream_set_blocking(true) toggles, not enables blocking) patch by askalski at gmail dot com http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.514r2=1.1760.2.515ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.514 php-src/NEWS:1.1760.2.515 --- php-src/NEWS:1.1760.2.514 Wed Nov 16 06:51:51 2005 +++ php-src/NEWSThu Nov 17 09:20:03 2005 @@ -8,6 +8,8 @@ - Fixed bug #35229 (call_user_func() crashes when arguement_stack is nearly full). (Dmitry) - Fixed bug #35197 (Destructor is not called). (Tony) +- Fixed bug #35079 (stream_set_blocking(true) toggles, not enables + blocking). (askalski at gmail dot com, Tony) - Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension is compiled as shared). (Dmitry) - Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.39.2.7r2=1.39.2.8ty=u Index: php-src/main/streams/plain_wrapper.c diff -u php-src/main/streams/plain_wrapper.c:1.39.2.7 php-src/main/streams/plain_wrapper.c:1.39.2.8 --- php-src/main/streams/plain_wrapper.c:1.39.2.7 Tue May 24 06:14:05 2005 +++ php-src/main/streams/plain_wrapper.cThu Nov 17 09:20:04 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: plain_wrapper.c,v 1.39.2.7 2005/05/24 10:14:05 tony2001 Exp $ */ +/* $Id: plain_wrapper.c,v 1.39.2.8 2005/11/17 14:20:04 tony2001 Exp $ */ #include php.h #include php_globals.h @@ -533,7 +533,7 @@ flags = fcntl(fd, F_GETFL, 0); oldval = (flags O_NONBLOCK) ? 0 : 1; if (value) - flags ^= O_NONBLOCK; + flags = ~O_NONBLOCK; else flags |= O_NONBLOCK; -- 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) / NEWS /ext/standard basic_functions.c /ext/standard/tests/general_functions bug35229.phpt
dmitry Wed Nov 16 04:30:54 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/general_functions bug35229.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard basic_functions.c
Log:
Fixed bug #35229 (call_user_func() crashes when arguement_stack is nearly
full)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.512r2=1.1760.2.513ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.512 php-src/NEWS:1.1760.2.513
--- php-src/NEWS:1.1760.2.512 Mon Nov 14 16:57:14 2005
+++ php-src/NEWSWed Nov 16 04:30:45 2005
@@ -4,6 +4,8 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #35229 (call_user_func() crashes when arguement_stack is nearly
+ full). (Dmitry)
- Fixed bug #35197 (Destructor is not called). (Tony)
- Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension
is compiled as shared). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/standard/basic_functions.c?r1=1.673.2.21r2=1.673.2.22ty=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.673.2.21
php-src/ext/standard/basic_functions.c:1.673.2.22
--- php-src/ext/standard/basic_functions.c:1.673.2.21 Thu Sep 29 12:31:20 2005
+++ php-src/ext/standard/basic_functions.c Wed Nov 16 04:30:51 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.673.2.21 2005/09/29 16:31:20 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.673.2.22 2005/11/16 09:30:51 dmitry Exp $ */
#include php.h
#include php_streams.h
@@ -1891,7 +1891,7 @@
params = safe_emalloc(sizeof(zval **), argc, 0);
- if (zend_get_parameters_array_ex(argc, params) == FAILURE) {
+ if (zend_get_parameters_array_ex(1, params) == FAILURE) {
efree(params);
RETURN_FALSE;
}
@@ -1908,6 +1908,11 @@
RETURN_NULL();
}
+ if (zend_get_parameters_array_ex(argc, params) == FAILURE) {
+ efree(params);
+ RETURN_FALSE;
+ }
+
if (call_user_function_ex(EG(function_table), NULL, *params[0],
retval_ptr, argc-1, params+1, 0, NULL TSRMLS_CC) == SUCCESS) {
if (retval_ptr) {
COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
http://cvs.php.net/co.php/php-src/ext/standard/tests/general_functions/bug35229.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/general_functions/bug35229.phpt
+++ php-src/ext/standard/tests/general_functions/bug35229.phpt
--
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) / NEWS /ext/dom php_dom.c /ext/spl spl_array.c spl_iterators.c /ext/sqlite sqlite.c /ext/tidy tidy.c /ext/xsl php_xsl.c
tony2001Mon Nov 14 16:57:18 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/sqlite sqlite.c
/php-src/ext/domphp_dom.c
/php-src/ext/splspl_array.c spl_iterators.c
/php-src/ext/xslphp_xsl.c
/php-src/ext/tidy tidy.c
Log:
MFH: fix #35197 (Destructor is not called) and similar issues in other
extensions
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.511r2=1.1760.2.512ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.511 php-src/NEWS:1.1760.2.512
--- php-src/NEWS:1.1760.2.511 Tue Nov 8 09:45:03 2005
+++ php-src/NEWSMon Nov 14 16:57:14 2005
@@ -4,6 +4,7 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #35197 (Destructor is not called). (Tony)
- Fixed bug #35009 (ZTS: Persistent resource destruct crashes when extension
is compiled as shared). (Dmitry)
- Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.146.2.8r2=1.146.2.9ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.146.2.8
php-src/ext/sqlite/sqlite.c:1.146.2.9
--- php-src/ext/sqlite/sqlite.c:1.146.2.8 Tue Oct 18 10:52:34 2005
+++ php-src/ext/sqlite/sqlite.c Mon Nov 14 16:57:16 2005
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.146.2.8 2005/10/18 14:52:34 tony2001 Exp $
+ $Id: sqlite.c,v 1.146.2.9 2005/11/14 21:57:16 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -802,7 +802,7 @@
zend_hash_init(intern-std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
zend_hash_copy(intern-std.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
- retval-handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL
TSRMLS_CC);
+ retval-handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t) sqlite_object_free_storage, NULL
TSRMLS_CC);
retval-handlers = handlers;
}
@@ -1076,7 +1076,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.146.2.8 2005/10/18 14:52:34
tony2001 Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.146.2.9 2005/11/14 21:57:16
tony2001 Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.60.2.9r2=1.60.2.10ty=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.60.2.9 php-src/ext/dom/php_dom.c:1.60.2.10
--- php-src/ext/dom/php_dom.c:1.60.2.9 Tue Sep 20 02:00:41 2005
+++ php-src/ext/dom/php_dom.c Mon Nov 14 16:57:16 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: php_dom.c,v 1.60.2.9 2005/09/20 06:00:41 dmitry Exp $ */
+/* $Id: php_dom.c,v 1.60.2.10 2005/11/14 21:57:16 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -989,7 +989,7 @@
intern = dom_objects_set_class(class_type, 1 TSRMLS_CC);
- retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t)dom_objects_free_storage, dom_objects_clone
TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t)dom_objects_free_storage, dom_objects_clone
TSRMLS_CC);
intern-handle = retval.handle;
retval.handlers = dom_get_obj_handlers(TSRMLS_C);
@@ -1006,7 +1006,7 @@
intern = dom_objects_set_class(class_type, 1 TSRMLS_CC);
- retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t)dom_xpath_objects_free_storage,
dom_objects_clone TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t)dom_xpath_objects_free_storage,
dom_objects_clone TSRMLS_CC);
intern-handle = retval.handle;
retval.handlers = dom_get_obj_handlers(TSRMLS_C);
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.49.2.8r2=1.49.2.9ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.49.2.8
php-src/ext/spl/spl_array.c:1.49.2.9
--- php-src/ext/spl/spl_array.c:1.49.2.8Mon
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
hirokawaTue Nov 8 09:45:04 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: NEWS updated. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.510r2=1.1760.2.511ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.510 php-src/NEWS:1.1760.2.511 --- php-src/NEWS:1.1760.2.510 Mon Nov 7 07:25:19 2005 +++ php-src/NEWSTue Nov 8 09:45:03 2005 @@ -46,6 +46,8 @@ (Marcus) - Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler). (Dmitry, Alex) +- Fixed bug #33720 (mb_encode_mimeheader does not work for multibyte + chars). (Rui) - Fixed bug #33383 (crash when retrieving empty LOBs). (Tony) - Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references). (Tony) - Fixed bug #29983 (PHP does not explicitly set mime type charset). (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_5_0) / NEWS /sapi/aolserver aolserver.c /sapi/apache2filter apache_config.c /sapi/apache2handler apache_config.c /sapi/nsapi nsapi.c
On Mon, 4 Jul 2005, Dmitry Stogov wrote:
dmitryMon Jul 4 08:47:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache2filter apache_config.c
/php-src/sapi/apache2handler apache_config.c
/php-src/sapi/nsapi nsapi.c
Log:
Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed)
Shouldn't this fix also be merged to the 4_4 branch?
regards,
Derick
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.447r2=1.1760.2.448ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.447 php-src/NEWS:1.1760.2.448
--- php-src/NEWS:1.1760.2.447 Mon Jul 4 06:08:19 2005
+++ php-src/NEWS Mon Jul 4 08:47:26 2005
@@ -14,6 +14,8 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33520 (crash if safe_mode is on and session.save_path is
changed).
+ (Dmitry)
- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob)
- Fixed bug #33277 (private method accessed by child class). (Dmitry)
http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c?r1=1.77r2=1.77.2.1ty=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.77
php-src/sapi/aolserver/aolserver.c:1.77.2.1
--- php-src/sapi/aolserver/aolserver.c:1.77 Thu Jan 8 03:18:02 2004
+++ php-src/sapi/aolserver/aolserver.cMon Jul 4 08:47:26 2005
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $ */
+/* $Id: aolserver.c,v 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, SAPI module version, $Id: aolserver.c,v
1.77 2004/01/08 08:18:02 andi Exp $);
+ php_info_print_table_row(2, SAPI module version, $Id: aolserver.c,v
1.77.2.1 2005/07/04 12:47:26 dmitry Exp $);
php_info_print_table_row(2, Build date, Ns_InfoBuildDate());
php_info_print_table_row(2, Config file path, Ns_InfoConfigFile());
php_info_print_table_row(2, Error Log path, Ns_InfoErrorLog());
@@ -549,7 +549,7 @@
Ns_Log(Debug, PHP configuration option
'%s=%s', new_key, val);
zend_alter_ini_entry(new_key, strlen(new_key) +
1, val,
- strlen(val) + 1,
PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ strlen(val) + 1,
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
efree(new_key);
}
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/apache_config.c?r1=1.32r2=1.32.2.1ty=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.32
php-src/sapi/apache2filter/apache_config.c:1.32.2.1
--- php-src/sapi/apache2filter/apache_config.c:1.32 Thu Jan 8 03:18:04 2004
+++ php-src/sapi/apache2filter/apache_config.cMon Jul 4 08:47:26 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.32 2004/01/08 08:18:04 andi Exp $ */
+/* $Id: apache_config.c,v 1.32.2.1 2005/07/04 12:47:26 dmitry Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -178,7 +178,7 @@
zend_hash_get_current_data(d-config, (void **) data);
phpapdebug((stderr, APPLYING (%s)(%s)\n, str, data-value));
if (zend_alter_ini_entry(str, str_len, data-value,
data-value_len,
- data-status, PHP_INI_STAGE_RUNTIME) ==
FAILURE) {
+ data-status, PHP_INI_STAGE_ACTIVATE)
== FAILURE) {
phpapdebug((stderr, ..FAILED\n));
}
}
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/apache_config.c?r1=1.5r2=1.5.2.1ty=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.5
php-src/sapi/apache2handler/apache_config.c:1.5.2.1
--- php-src/sapi/apache2handler/apache_config.c:1.5 Thu Jan 8 03:18:05 2004
+++ php-src/sapi/apache2handler/apache_config.c Mon Jul 4 08:47:26 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.5 2004/01/08 08:18:05 andi Exp $ */
+/* $Id: apache_config.c,v 1.5.2.1 2005/07/04 12:47:26 dmitry Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -166,7 +166,7 @@
RE: [PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /sapi/aolserver aolserver.c/sapi/apache2filter apache_config.c /sapi/apache2handler apache_config.c/sapi/nsapi nsapi.c
Hi Derick,
I really don't know.
It was very long time ago.
Thanks. Dmitry.
-Original Message-
From: Derick Rethans [mailto:[EMAIL PROTECTED]
Sent: Friday, November 04, 2005 12:01 AM
To: Dmitry Stogov
Cc: php-cvs@lists.php.net
Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
/sapi/aolserver aolserver.c/sapi/apache2filter
apache_config.c /sapi/apache2handler
apache_config.c/sapi/nsapi nsapi.c
On Mon, 4 Jul 2005, Dmitry Stogov wrote:
dmitry Mon Jul 4 08:47:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache2filter apache_config.c
/php-src/sapi/apache2handlerapache_config.c
/php-src/sapi/nsapi nsapi.c
Log:
Fixed bug #33520 (crash if safe_mode is on and
session.save_path is
changed)
Shouldn't this fix also be merged to the 4_4 branch?
regards,
Derick
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.447r2=1.1760.2.4
48ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.447 php-src/NEWS:1.1760.2.448
--- php-src/NEWS:1.1760.2.447 Mon Jul 4 06:08:19 2005
+++ php-src/NEWSMon Jul 4 08:47:26 2005
@@ -14,6 +14,8 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems.
(Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw
exception. (Tony)
+- Fixed bug #33520 (crash if safe_mode is on and
session.save_path is
+changed).
+ (Dmitry)
- Fixed bug #33491 (crash after extending MySQLi internal class).
(Tony)
- Fixed bug #33340 (CLI Crash when calling php:function
from XSLT). (Rob)
- Fixed bug #33277 (private method accessed by child
class). (Dmitry)
http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c
?r1=1.77r2=1.77.2.1ty=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.77
php-src/sapi/aolserver/aolserver.c:1.77.2.1
--- php-src/sapi/aolserver/aolserver.c:1.77 Thu Jan 8 03:18:02 2004
+++ php-src/sapi/aolserver/aolserver.c Mon Jul 4 08:47:26 2005
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $ */
+/* $Id: aolserver.c,v 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, SAPI module version,
$Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $);
+ php_info_print_table_row(2, SAPI module version, $Id:
+aolserver.c,v 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $);
php_info_print_table_row(2, Build date, Ns_InfoBuildDate());
php_info_print_table_row(2, Config file path,
Ns_InfoConfigFile());
php_info_print_table_row(2, Error Log path,
Ns_InfoErrorLog()); @@
-549,7 +549,7 @@
Ns_Log(Debug, PHP
configuration option '%s=%s', new_key, val);
zend_alter_ini_entry(new_key,
strlen(new_key) + 1, val,
- strlen(val) +
1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ strlen(val) +
1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
efree(new_key);
}
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/apache_config.c
?r1=1.32r2=1.32.2.1ty=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.32
php-src/sapi/apache2filter/apache_config.c:1.32.2.1
--- php-src/sapi/apache2filter/apache_config.c:1.32 Thu Jan
8 03:18:04 2004
+++ php-src/sapi/apache2filter/apache_config.c Mon Jul
4 08:47:26 2005
@@ -16,7 +16,7 @@
+-
-+
*/
-/* $Id: apache_config.c,v 1.32 2004/01/08 08:18:04 andi Exp $ */
+/* $Id: apache_config.c,v 1.32.2.1 2005/07/04 12:47:26
dmitry Exp $
+*/
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -178,7 +178,7 @@
zend_hash_get_current_data(d-config, (void **) data);
phpapdebug((stderr, APPLYING (%s)(%s)\n, str,
data-value));
if (zend_alter_ini_entry(str, str_len,
data-value, data-value_len,
- data-status,
PHP_INI_STAGE_RUNTIME) == FAILURE) {
+ data-status,
PHP_INI_STAGE_ACTIVATE) == FAILURE) {
phpapdebug((stderr, ..FAILED\n));
}
}
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/apache_config.
c?r1=1.5r2=1.5.2.1ty=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.5
php-src/sapi
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/standard array.c
dmitry Fri Oct 28 05:57:16 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #34982 (array_walk_recursive() modifies elements outside function
scope)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.507r2=1.1760.2.508ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.507 php-src/NEWS:1.1760.2.508
--- php-src/NEWS:1.1760.2.507 Wed Oct 26 17:39:20 2005
+++ php-src/NEWSFri Oct 28 05:57:12 2005
@@ -6,6 +6,8 @@
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
- Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is
zero). (Tony)
+- Fixed bug #34982 (array_walk_recursive() modifies elements outside function
+ scope). (Dmitry)
- Fixed bug #34977 (Compile failure on MacOSX due to use of varargs.h). (Tony)
- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry)
- Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.28r2=1.266.2.29ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.28
php-src/ext/standard/array.c:1.266.2.29
--- php-src/ext/standard/array.c:1.266.2.28 Tue Oct 4 16:49:35 2005
+++ php-src/ext/standard/array.cFri Oct 28 05:57:15 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.28 2005/10/04 20:49:35 tony2001 Exp $ */
+/* $Id: array.c,v 1.266.2.29 2005/10/28 09:57:15 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -1050,6 +1050,7 @@
if (recursive Z_TYPE_PP(args[0]) == IS_ARRAY) {
HashTable *thash;
+ SEPARATE_ZVAL_TO_MAKE_IS_REF(args[0]);
thash = HASH_OF(*(args[0]));
if (thash == target_hash) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
recursion detected);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/gd gd.c
On Thu, 27 Oct 2005, Antony Dovgal wrote: On 27.10.2005 01:49, Derick Rethans wrote: On Wed, 26 Oct 2005, Antony Dovgal wrote: tony2001 Wed Oct 26 17:39:23 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/gdgd.c Log: fix #34996 (ImageTrueColorToPalette() crashes when ncolors is zero) Is this an issue for 4.4 too? Yes. Should I merge it to 4.4 too? yes, it's nice if fixes for crash bugs are merged too... 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_5_0) / NEWS /ext/mbstring config.m4
tony2001Wed Oct 26 09:52:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mbstring config.m4
/php-srcNEWS
Log:
MFH: fix #34977 (Compile failure on MacOSX due to use of varargs.h)
http://cvs.php.net/diff.php/php-src/ext/mbstring/config.m4?r1=1.51.2.3r2=1.51.2.4ty=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.51.2.3
php-src/ext/mbstring/config.m4:1.51.2.4
--- php-src/ext/mbstring/config.m4:1.51.2.3 Sun Feb 20 18:02:48 2005
+++ php-src/ext/mbstring/config.m4 Wed Oct 26 09:51:58 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.51.2.3 2005/02/20 23:02:48 moriyoshi Exp $
+dnl $Id: config.m4,v 1.51.2.4 2005/10/26 13:51:58 tony2001 Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -55,7 +55,8 @@
AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
if test $PHP_MBREGEX = yes; then
AC_CACHE_CHECK(for variable length prototypes and stdarg.h,
cv_php_mbstring_stdarg, [
- AC_TRY_COMPILE([#include stdarg.h], [
+ AC_TRY_RUN([
+#include stdarg.h
int foo(int x, ...) {
va_list va;
va_start(va, x);
@@ -65,7 +66,7 @@
return 0;
}
int main() { return foo(10, , 3.14); }
- ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no])
+ ], [cv_php_mbstring_stdarg=yes], [cv_php_mbstring_stdarg=no],
[cv_php_mbstring_stdarg=no])
])
AC_CHECK_HEADERS([stdlib.h string.h strings.h unistd.h sys/time.h
sys/times.h])
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.505r2=1.1760.2.506ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.505 php-src/NEWS:1.1760.2.506
--- php-src/NEWS:1.1760.2.505 Mon Oct 24 03:45:48 2005
+++ php-src/NEWSWed Oct 26 09:51:58 2005
@@ -4,6 +4,7 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34977 (Compile failure on MacOSX due to use of varargs.h). (Tony)
- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry)
- Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and
leaks). (Tony)
--
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) / NEWS /ext/gd gd.c
tony2001Wed Oct 26 17:39:23 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/gd gd.c
Log:
fix #34996 (ImageTrueColorToPalette() crashes when ncolors is zero)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.506r2=1.1760.2.507ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.506 php-src/NEWS:1.1760.2.507
--- php-src/NEWS:1.1760.2.506 Wed Oct 26 09:51:58 2005
+++ php-src/NEWSWed Oct 26 17:39:20 2005
@@ -4,6 +4,8 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is
+ zero). (Tony)
- Fixed bug #34977 (Compile failure on MacOSX due to use of varargs.h). (Tony)
- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry)
- Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.294.2.13r2=1.294.2.14ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.294.2.13 php-src/ext/gd/gd.c:1.294.2.14
--- php-src/ext/gd/gd.c:1.294.2.13 Thu Oct 6 16:42:56 2005
+++ php-src/ext/gd/gd.c Wed Oct 26 17:39:22 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.294.2.13 2005/10/06 20:42:56 iliaa Exp $ */
+/* $Id: gd.c,v 1.294.2.14 2005/10/26 21:39:22 tony2001 Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -889,6 +889,10 @@
convert_to_boolean_ex(dither);
convert_to_long_ex(ncolors);
+ if (Z_LVAL_PP(ncolors) = 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Number of colors
has to be greater than zero);
+ RETURN_FALSE;
+ }
gdImageTrueColorToPalette(im, Z_LVAL_PP(dither), Z_LVAL_PP(ncolors));
RETURN_TRUE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/gd gd.c
On Wed, 26 Oct 2005, Antony Dovgal wrote: tony2001 Wed Oct 26 17:39:23 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/gd gd.c Log: fix #34996 (ImageTrueColorToPalette() crashes when ncolors is zero) Is this an issue for 4.4 too? 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
Re: [PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/gd gd.c
On 27.10.2005 01:49, Derick Rethans wrote: On Wed, 26 Oct 2005, Antony Dovgal wrote: tony2001Wed Oct 26 17:39:23 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/gd gd.c Log: fix #34996 (ImageTrueColorToPalette() crashes when ncolors is zero) Is this an issue for 4.4 too? Yes. Should I merge it to 4.4 too? -- Wbr, Antony Dovgal -- 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) / NEWS /ext/soap php_sdl.c
dmitry Mon Oct 24 03:45:50 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/ext/soap php_sdl.c Log: Fixed bug #34950 (Unable to get WSDL through proxy) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.504r2=1.1760.2.505ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.504 php-src/NEWS:1.1760.2.505 --- php-src/NEWS:1.1760.2.504 Sun Oct 23 14:35:19 2005 +++ php-src/NEWSMon Oct 24 03:45:48 2005 @@ -4,6 +4,7 @@ - Fixed an error in mysqli_fetch_fields (returned NULL instead of an array when row number field_count). (Georg) - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- Fixed bug #34950 (Unable to get WSDL through proxy). (Dmitry) - Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and leaks). (Tony) - Fixed bug #34856 (configure fails to detect libiconv's type). (Tony) http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.12r2=1.70.2.13ty=u Index: php-src/ext/soap/php_sdl.c diff -u php-src/ext/soap/php_sdl.c:1.70.2.12 php-src/ext/soap/php_sdl.c:1.70.2.13 --- php-src/ext/soap/php_sdl.c:1.70.2.12Fri Jul 8 05:36:42 2005 +++ php-src/ext/soap/php_sdl.c Mon Oct 24 03:45:49 2005 @@ -17,7 +17,7 @@ | Dmitry Stogov [EMAIL PROTECTED] | +--+ */ -/* $Id: php_sdl.c,v 1.70.2.12 2005/07/08 09:36:42 dmitry Exp $ */ +/* $Id: php_sdl.c,v 1.70.2.13 2005/10/24 07:45:49 dmitry Exp $ */ #include php_soap.h #include ext/libxml/php_libxml.h @@ -2230,6 +2230,7 @@ smart_str_appends(proxy,Z_STRVAL_PP(proxy_host)); smart_str_appends(proxy,:); smart_str_appends(proxy,Z_STRVAL(str_port)); + smart_str_0(proxy); zval_dtor(str_port); MAKE_STD_ZVAL(str_proxy); ZVAL_STRING(str_proxy, proxy.c, 1); @@ -2239,6 +2240,11 @@ php_stream_context_set_option(context, http, proxy, str_proxy); zval_ptr_dtor(str_proxy); + MAKE_STD_ZVAL(str_proxy); + ZVAL_BOOL(str_proxy, 1); + php_stream_context_set_option(context, http, request_fulluri, str_proxy); + zval_ptr_dtor(str_proxy); + proxy_authentication(this_ptr, headers TSRMLS_CC); } -- 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) / NEWS /ext/standard dns.c
tony2001Sun Oct 23 14:35:20 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard dns.c
Log:
MFH: fix #34938 (dns_get_record() doesn't resolve long hostnames and leaks)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.503r2=1.1760.2.504ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.503 php-src/NEWS:1.1760.2.504
--- php-src/NEWS:1.1760.2.503 Fri Oct 21 05:56:36 2005
+++ php-src/NEWSSun Oct 23 14:35:19 2005
@@ -4,6 +4,8 @@
- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34938 (dns_get_record() doesn't resolve long hostnames and
+ leaks). (Tony)
- Fixed bug #34856 (configure fails to detect libiconv's type). (Tony)
- Fixed bug #34855 (ibase_service_attach() segfault on AMD64).
(irie at gmx dot de, Tony)
http://cvs.php.net/diff.php/php-src/ext/standard/dns.c?r1=1.68.2.1r2=1.68.2.2ty=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.68.2.1 php-src/ext/standard/dns.c:1.68.2.2
--- php-src/ext/standard/dns.c:1.68.2.1 Fri Oct 21 09:49:22 2005
+++ php-src/ext/standard/dns.c Sun Oct 23 14:35:20 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.68.2.1 2005/10/21 13:49:22 tony2001 Exp $ */
+/* $Id: dns.c,v 1.68.2.2 2005/10/23 18:35:20 tony2001 Exp $ */
/* {{{ includes */
#include php.h
@@ -307,9 +307,8 @@
#define QFIXEDSZ4 /* fixed data in query arpa/nameser.h */
#endif /* QFIXEDSZ */
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 256
-#endif /* MAXHOSTNAMELEN */
+#undef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 1024
#ifndef MAXRESOURCERECORDS
#define MAXRESOURCERECORDS 64
@@ -320,10 +319,25 @@
u_char qb2[65536];
} querybuf;
+/* just a hack to free resources allocated by glibc in __res_nsend()
+ * See also:
+ * res_thread_freeres() in glibc/resolv/res_init.c
+ * __libc_res_nsend() in resolv/res_send.c
+ * */
+static void _php_dns_free_res(struct __res_state res) { /* {{{ */
+ int ns;
+ for (ns = 0; ns MAXNS; ns++) {
+ if (res._u._ext.nsaddrs[ns] != NULL) {
+ free (res._u._ext.nsaddrs[ns]);
+ res._u._ext.nsaddrs[ns] = NULL;
+ }
+ }
+} /* }}} */
+
/* {{{ php_parserr */
static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch,
int store, zval **subarray)
{
- u_short type, class, dlen;
+ u_short type, dlen;
u_long ttl;
long n, i;
u_short s;
@@ -332,14 +346,13 @@
*subarray = NULL;
- n = dn_expand(answer-qb2, answer-qb2+65536, cp, name, (sizeof(name))
- 2);
+ n = dn_expand(answer-qb2, answer-qb2+65536, cp, name, sizeof(name) -
2);
if (n 0) {
return NULL;
}
cp += n;
GETSHORT(type, cp);
- GETSHORT(class, cp);
GETLONG(ttl, cp);
GETSHORT(dlen, cp);
if (type_to_fetch != T_ANY type != type_to_fetch) {
@@ -522,7 +535,7 @@
HEADER *hp;
querybuf buf, answer;
u_char *cp = NULL, *end = NULL;
- long n, qd, an, ns = 0, ar = 0;
+ int n, qd, an, ns = 0, ar = 0;
int type, first_query = 1, store_results = 1;
switch (ZEND_NUM_ARGS()) {
@@ -629,6 +642,7 @@
break;
}
if (type_to_fetch) {
+ memset(res, 0, sizeof(res));
res_ninit(res);
res.retrans = 5;
res.options = ~RES_DEFNAMES;
@@ -637,12 +651,16 @@
if (n0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
res_nmkquery() failed);
zval_dtor(return_value);
+ res_nclose(res);
+ _php_dns_free_res(res);
RETURN_FALSE;
}
n = res_nsend(res, buf.qb2, n, answer.qb2, sizeof
answer);
if (n0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
res_nsend() failed);
zval_dtor(return_value);
+ res_nclose(res);
+ _php_dns_free_res(res);
RETURN_FALSE;
}
@@ -660,6 +678,8 @@
if (n 0) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, Unable to parse DNS data received);
zval_dtor(return_value);
+ res_nclose(res);
+
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
dmitry Fri Oct 21 05:56:40 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: Fixed bug #34782 (token_get_all() gives wrong result) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.502r2=1.1760.2.503ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.502 php-src/NEWS:1.1760.2.503 --- php-src/NEWS:1.1760.2.502 Wed Oct 19 19:11:12 2005 +++ php-src/NEWSFri Oct 21 05:56:36 2005 @@ -14,6 +14,7 @@ - Fixed bug #34788 (SOAP Client not applying correct namespace to generated values). (Dmitry) - Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry) +- Fixed bug #34782 (token_get_all() gives wrong result). (Dmitry) - Fixed bug #34757 (iconv_substr() gives Unknown error when offset string length). (Tony) - Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony) -- 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) / NEWS
tony2001Wed Oct 19 19:11:14 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.501r2=1.1760.2.502ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.501 php-src/NEWS:1.1760.2.502 --- php-src/NEWS:1.1760.2.501 Sat Oct 15 03:33:01 2005 +++ php-src/NEWSWed Oct 19 19:11:12 2005 @@ -35,6 +35,7 @@ (Dmitry, Alex) - Fixed bug #33383 (crash when retrieving empty LOBs). (Tony) - Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references). (Tony) +- Fixed bug #29983 (PHP does not explicitly set mime type charset). (Ilia) 05 Sep 2005, PHP 5.0.5 - Upgraded PCRE library to version 5.0. (Andrei) -- 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) / NEWS /ext/mysqli mysqli_api.c
georg Sat Oct 15 03:33:14 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mysqli mysqli_api.c
Log:
Fixed an error in mysqli_fetch_fields (returned NULL instead of an
array when row number field_count). (Georg)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.500r2=1.1760.2.501ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.500 php-src/NEWS:1.1760.2.501
--- php-src/NEWS:1.1760.2.500 Thu Oct 13 11:24:25 2005
+++ php-src/NEWSSat Oct 15 03:33:01 2005
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? , PHP 5.0.6
+- Fixed an error in mysqli_fetch_fields (returned NULL instead of an
+ array when row number field_count). (Georg)
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
- Fixed bug #34856 (configure fails to detect libiconv's type). (Tony)
- Fixed bug #34855 (ibase_service_attach() segfault on AMD64).
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.24r2=1.87.2.25ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.24
php-src/ext/mysqli/mysqli_api.c:1.87.2.25
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.24 Mon Oct 10 08:59:06 2005
+++ php-src/ext/mysqli/mysqli_api.c Sat Oct 15 03:33:12 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.87.2.24 2005/10/10 12:59:06 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.87.2.25 2005/10/15 07:33:12 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -742,10 +742,6 @@
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result,
mysqli_result);
- if (!(field = mysql_fetch_field(result))) {
- RETURN_FALSE;
- }
-
array_init(return_value);
for (i = 0; i mysql_num_fields(result); i++) {
--
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) / NEWS /ext/iconv config.m4
tony2001Thu Oct 13 11:24:26 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/iconv config.m4 /php-srcNEWS Log: MFH: fix #34856 (configure fails to detect libiconv's type) http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.27.2.2r2=1.27.2.3ty=u Index: php-src/ext/iconv/config.m4 diff -u php-src/ext/iconv/config.m4:1.27.2.2 php-src/ext/iconv/config.m4:1.27.2.3 --- php-src/ext/iconv/config.m4:1.27.2.2Mon Jan 10 16:37:59 2005 +++ php-src/ext/iconv/config.m4 Thu Oct 13 11:24:25 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.27.2.2 2005/01/10 21:37:59 tony2001 Exp $ +dnl $Id: config.m4,v 1.27.2.3 2005/10/13 15:24:25 tony2001 Exp $ dnl PHP_ARG_WITH(iconv, for iconv support, @@ -18,7 +18,14 @@ iconv_ldflags_save=$LDFLAGS if test -z $ICONV_DIR; then - PHP_ICONV_PREFIX=/usr + for i in /usr /usr/local; do +if test -f $i/include/iconv.h -o test -f $i/include/giconv.h; then + PHP_ICONV_PREFIX=$i +fi + done + if test -z $PHP_ICONV_PREFIX; then +PHP_ICONV_PREFIX=/usr + fi else PHP_ICONV_PREFIX=$ICONV_DIR fi http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.499r2=1.1760.2.500ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.499 php-src/NEWS:1.1760.2.500 --- php-src/NEWS:1.1760.2.499 Thu Oct 13 08:59:12 2005 +++ php-src/NEWSThu Oct 13 11:24:25 2005 @@ -2,6 +2,7 @@ ||| ?? ??? , PHP 5.0.6 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- Fixed bug #34856 (configure fails to detect libiconv's type). (Tony) - Fixed bug #34855 (ibase_service_attach() segfault on AMD64). (irie at gmx dot de, Tony) - Fixed bug #34810 (mysqli::init() and others use wrong $this pointer -- 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) / NEWS /ext/pcre php_pcre.c /ext/pcre/tests bug34790.phpt
dmitry Tue Oct 11 02:48:13 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/pcre/tests bug34790.phpt
Modified files:
/php-srcNEWS
/php-src/ext/pcre php_pcre.c
Log:
Fixed bug #34790 (preg_match_all(), named capturing groups, variable
assignment/return = crash)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.496r2=1.1760.2.497ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.496 php-src/NEWS:1.1760.2.497
--- php-src/NEWS:1.1760.2.496 Mon Oct 10 08:59:05 2005
+++ php-src/NEWSTue Oct 11 02:48:10 2005
@@ -4,6 +4,8 @@
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
- Fixed bug #34810 (mysqli::init() and others use wrong $this pointer
without checks). (Tony)
+- Fixed bug #34790 (preg_match_all(), named capturing groups, variable
+ assignment/return = crash). (Dmitry)
- Fixed bug #34788 (SOAP Client not applying correct namespace to generated
values). (Dmitry)
- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.157.2.5r2=1.157.2.6ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.157.2.5
php-src/ext/pcre/php_pcre.c:1.157.2.6
--- php-src/ext/pcre/php_pcre.c:1.157.2.5 Tue May 31 08:55:33 2005
+++ php-src/ext/pcre/php_pcre.c Tue Oct 11 02:48:11 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.157.2.5 2005/05/31 12:55:33 sniper Exp $ */
+/* $Id: php_pcre.c,v 1.157.2.6 2005/10/11 06:48:11 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -620,6 +620,7 @@
if (subpat_names[i]) {
zend_hash_update(Z_ARRVAL_P(subpats),
subpat_names[i],
strlen(subpat_names[i])+1, match_sets[i], sizeof(zval *), NULL);
+ ZVAL_ADDREF(match_sets[i]);
}
zend_hash_next_index_insert(Z_ARRVAL_P(subpats),
match_sets[i], sizeof(zval *), NULL);
}
http://cvs.php.net/co.php/php-src/ext/pcre/tests/bug34790.phpt?r=1.1p=1
Index: php-src/ext/pcre/tests/bug34790.phpt
+++ php-src/ext/pcre/tests/bug34790.phpt
--TEST--
Bug #34790 (preg_match_all(), named capturing groups, variable
assignment/return = crash)
--FILE--
?php
function func1(){
$string = 'what the word and the other word the';
preg_match_all('/(?Pwordthe)/', $string, $matches);
return $matches['word'];
}
$words = func1();
var_dump($words);
?
--EXPECT--
array(4) {
[0]=
string(3) the
[1]=
string(3) the
[2]=
string(3) the
[3]=
string(3) the
}
--
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) / NEWS /ext/iconv iconv.c
tony2001Tue Oct 11 09:51:31 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/iconv iconv.c
/php-srcNEWS
Log:
MF51: fix #34757 (iconv_substr() gives Unknown error when offset string
length)
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.117.2.6r2=1.117.2.7ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.117.2.6 php-src/ext/iconv/iconv.c:1.117.2.7
--- php-src/ext/iconv/iconv.c:1.117.2.6 Wed Jun 8 19:51:05 2005
+++ php-src/ext/iconv/iconv.c Tue Oct 11 09:51:28 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: iconv.c,v 1.117.2.6 2005/06/08 23:51:05 iliaa Exp $ */
+/* $Id: iconv.c,v 1.117.2.7 2005/10/11 13:51:28 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -583,26 +583,38 @@
size_t out_left;
unsigned int cnt;
-
+ unsigned int total_len;
+
+ err = _php_iconv_strlen(total_len, str, nbytes, enc);
+ if (err != PHP_ICONV_ERR_SUCCESS) {
+ return err;
+ }
+
/* normalize the offset and the length */
- if (offset 0 || len 0) {
- unsigned int total_len;
- err = _php_iconv_strlen(total_len, str, nbytes, enc);
- if (err != PHP_ICONV_ERR_SUCCESS) {
- return err;
- }
- if (offset 0) {
- if ((offset += total_len) 0) {
- offset = 0;
- }
+ if (offset 0) {
+ if ((offset += total_len) 0) {
+ offset = 0;
}
- if (len 0) {
- if ((len += (total_len - offset)) 0) {
- len = 0;
- }
+ }
+ if (len 0) {
+ if ((len += (total_len - offset)) 0) {
+ len = 0;
}
}
+ if (offset = total_len) {
+ return PHP_ICONV_ERR_SUCCESS;
+ }
+
+ if ((offset + len) total_len) {
+ /* trying to compute the length */
+ len = total_len - offset;
+ }
+
+ if (len == 0) {
+ return PHP_ICONV_ERR_SUCCESS;
+ }
+
cd1 = iconv_open(GENERIC_SUPERSET_NAME, enc);
if (cd1 == (iconv_t)(-1)) {
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.497r2=1.1760.2.498ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.497 php-src/NEWS:1.1760.2.498
--- php-src/NEWS:1.1760.2.497 Tue Oct 11 02:48:10 2005
+++ php-src/NEWSTue Oct 11 09:51:29 2005
@@ -9,6 +9,8 @@
- Fixed bug #34788 (SOAP Client not applying correct namespace to generated
values). (Dmitry)
- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
+- Fixed bug #34757 (iconv_substr() gives Unknown error when offset string
+ length). (Tony)
- Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)
- Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)
--
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) / NEWS
tony2001Mon Oct 10 06:47:12 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.494r2=1.1760.2.495ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.494 php-src/NEWS:1.1760.2.495 --- php-src/NEWS:1.1760.2.494 Sun Oct 9 10:38:06 2005 +++ php-src/NEWSMon Oct 10 06:47:11 2005 @@ -22,6 +22,7 @@ (Marcus) - Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler). (Dmitry, Alex) +- Fixed bug #33383 (crash when retrieving empty LOBs). (Tony) - Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references). (Tony) 05 Sep 2005, PHP 5.0.5 -- 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) / NEWS /ext/mysqli mysqli_api.c mysqli_nonapi.c php_mysqli.h /ext/mysqli/tests bug34810.phpt
tony2001Mon Oct 10 08:59:07 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/mysqli/tests bug34810.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c php_mysqli.h
Log:
MF51: fix #34810 (mysqli::init() and others use wrong $this pointer without
checks)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.495r2=1.1760.2.496ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.495 php-src/NEWS:1.1760.2.496
--- php-src/NEWS:1.1760.2.495 Mon Oct 10 06:47:11 2005
+++ php-src/NEWSMon Oct 10 08:59:05 2005
@@ -2,6 +2,8 @@
|||
?? ??? , PHP 5.0.6
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34810 (mysqli::init() and others use wrong $this pointer
+ without checks). (Tony)
- Fixed bug #34788 (SOAP Client not applying correct namespace to generated
values). (Dmitry)
- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.23r2=1.87.2.24ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.23
php-src/ext/mysqli/mysqli_api.c:1.87.2.24
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.23 Thu Sep 22 16:14:25 2005
+++ php-src/ext/mysqli/mysqli_api.c Mon Oct 10 08:59:06 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.87.2.23 2005/09/22 20:14:25 tony2001 Exp $
+ $Id: mysqli_api.c,v 1.87.2.24 2005/10/10 12:59:06 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1033,7 +1033,7 @@
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1,
sizeof(MYSQLI_RESOURCE));
mysqli_resource-ptr = (void *)mysql;
- if (!getThis()) {
+ if (!getThis() || !instanceof_function(Z_OBJCE_P(getThis()),
mysqli_link_class_entry TSRMLS_CC)) {
MYSQLI_RETURN_RESOURCE(mysqli_resource,
mysqli_link_class_entry);
} else {
((mysqli_object *) zend_object_store_get_object(getThis()
TSRMLS_CC))-ptr = mysqli_resource;
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.34.2.11r2=1.34.2.12ty=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.11
php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.12
--- php-src/ext/mysqli/mysqli_nonapi.c:1.34.2.11Sat Aug 6 12:56:06 2005
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Oct 10 08:59:06 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_nonapi.c,v 1.34.2.11 2005/08/06 16:56:06 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.34.2.12 2005/10/10 12:59:06 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -104,7 +104,7 @@
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1,
sizeof(MYSQLI_RESOURCE));
mysqli_resource-ptr = (void *)mysql;
- if (!object) {
+ if (!object || !instanceof_function(Z_OBJCE_P(object),
mysqli_link_class_entry TSRMLS_CC)) {
MYSQLI_RETURN_RESOURCE(mysqli_resource,
mysqli_link_class_entry);
} else {
((mysqli_object *) zend_object_store_get_object(object
TSRMLS_CC))-ptr = mysqli_resource;
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.38.2.6r2=1.38.2.7ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.38.2.6
php-src/ext/mysqli/php_mysqli.h:1.38.2.7
--- php-src/ext/mysqli/php_mysqli.h:1.38.2.6Sat May 21 04:54:56 2005
+++ php-src/ext/mysqli/php_mysqli.h Mon Oct 10 08:59:06 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.38.2.6 2005/05/21 08:54:56 georg Exp $
+ $Id: php_mysqli.h,v 1.38.2.7 2005/10/10 12:59:06 tony2001 Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -164,7 +164,7 @@
#define MYSQLI_REGISTER_RESOURCE(__ptr, __ce) \
{\
zval *object = getThis();\
- if (!object) {\
+ if (!object || !instanceof_function(Z_OBJCE_P(object),
mysqli_link_class_entry TSRMLS_CC)) {\
object = return_value;\
Z_TYPE_P(object) = IS_OBJECT;\
(object)-value.obj = mysqli_objects_new(__ce TSRMLS_CC);\
http://cvs.php.net/co.php/php-src/ext/mysqli/tests/bug34810.phpt?r=1.1p=1
Index: php-src/ext/mysqli/tests/bug34810.phpt
+++ php-src/ext/mysqli/tests/bug34810.phpt
--
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) / NEWS /ext/soap php_encoding.c /ext/soap/tests/schema schema062.phpt
dmitry Sun Oct 9 07:05:09 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap php_encoding.c
/php-src/ext/soap/tests/schema schema062.phpt
Log:
Fixed bug #34787 (SOAP Client not handling boolean types correctly)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.491r2=1.1760.2.492ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.491 php-src/NEWS:1.1760.2.492
--- php-src/NEWS:1.1760.2.491 Thu Oct 6 16:36:42 2005
+++ php-src/NEWSSun Oct 9 07:05:05 2005
@@ -2,6 +2,7 @@
|||
?? ??? , PHP 5.0.6
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
- Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
- Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)
- Fixed bug #34643 (wsdl default value has no effect). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.71.2.27r2=1.71.2.28ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.71.2.27
php-src/ext/soap/php_encoding.c:1.71.2.28
--- php-src/ext/soap/php_encoding.c:1.71.2.27 Thu Sep 29 06:08:16 2005
+++ php-src/ext/soap/php_encoding.c Sun Oct 9 07:05:08 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.71.2.27 2005/09/29 10:08:16 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.71.2.28 2005/10/09 11:05:08 dmitry Exp $ */
#include time.h
@@ -110,7 +110,7 @@
{ \
if (!zval || Z_TYPE_P(zval) == IS_NULL) { \
if (style == SOAP_ENCODED) {\
- xmlSetProp(xml, xsi:nil, 1); \
+ xmlSetProp(xml, xsi:nil, true); \
} \
return xml; \
} \
@@ -866,7 +866,7 @@
ret = xmlNewNode(NULL,BOGUS);
xmlAddChild(parent, ret);
if (style == SOAP_ENCODED) {
- xmlSetProp(ret, xsi:nil, 1);
+ xmlSetProp(ret, xsi:nil, true);
}
return ret;
}
@@ -1237,10 +1237,10 @@
property =
xmlNewNode(NULL,BOGUS);
xmlAddChild(node,
property);
if (style ==
SOAP_ENCODED) {
-
xmlSetProp(property, xsi:nil, 1);
+
xmlSetProp(property, xsi:nil, true);
} else {
xmlNsPtr xsi =
encode_add_ns(property,XSI_NAMESPACE);
-
xmlSetNsProp(property, xsi, nil, 1);
+
xmlSetNsProp(property, xsi, nil, true);
}
} else {
property =
master_to_xml(enc, *val, style, node);
@@ -1263,10 +1263,10 @@
property =
xmlNewNode(NULL,BOGUS);
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
- xmlSetProp(property,
xsi:nil, 1);
+ xmlSetProp(property,
xsi:nil, true);
} else {
xmlNsPtr xsi =
encode_add_ns(property,XSI_NAMESPACE);
- xmlSetNsProp(property,
xsi, nil, 1);
+ xmlSetNsProp(property,
xsi, nil, true);
}
} else {
property = master_to_xml(enc,
data, style, node);
@@ -1288,10 +1288,10 @@
property =
xmlNewNode(NULL,model-u.element-name);
xmlAddChild(node, property);
if (style == SOAP_ENCODED) {
- xmlSetProp(property, xsi:nil, 1);
+ xmlSetProp(property, xsi:nil, true);
} else {
xmlNsPtr xsi =
encode_add_ns(property,XSI_NAMESPACE);
- xmlSetNsProp(property, xsi, nil, 1);
+
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/exif exif.c /ext/exif/tests bug34704.jpg bug34704.phpt
helly Sun Oct 9 10:38:08 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/exif/tests bug34704.jpg bug34704.phpt
Modified files:
/php-srcNEWS
/php-src/ext/exif exif.c
Log:
- MFH Bugfix #34704 (Infinite recursion due to corrupt JPEG)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.493r2=1.1760.2.494ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.493 php-src/NEWS:1.1760.2.494
--- php-src/NEWS:1.1760.2.493 Sun Oct 9 08:41:25 2005
+++ php-src/NEWSSun Oct 9 10:38:06 2005
@@ -6,6 +6,7 @@
values). (Dmitry)
- Fixed bug #34787 (SOAP Client not handling boolean types correctly). (Dmitry)
- Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
+- Fixed bug #34704 (Infinite recursion due to corrupt JPEG). (Marcus)
- Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)
- Fixed bug #34643 (wsdl default value has no effect). (Dmitry)
- Fixed bug #34617 (zend_deactivate: objects_store used after
@@ -17,6 +18,8 @@
- Fixed bug #34453 (parsing http://www.w3.org/2001/xml.xsd exception). (Dmitry)
- Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
+- Fixed Bug #34243 (ReflectionClass::getDocComment() returns no result).
+ (Marcus)
- Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler).
(Dmitry, Alex)
- Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references).
(Tony)
http://cvs.php.net/diff.php/php-src/ext/exif/exif.c?r1=1.162.2.9r2=1.162.2.10ty=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.162.2.9 php-src/ext/exif/exif.c:1.162.2.10
--- php-src/ext/exif/exif.c:1.162.2.9 Fri Aug 5 10:00:47 2005
+++ php-src/ext/exif/exif.c Sun Oct 9 10:38:07 2005
@@ -2,7 +2,7 @@
+--+
| PHP Version 5|
+--+
- | Copyright (c) 1997-2004 The PHP Group|
+ | Copyright (c) 1997-2005 The PHP Group|
+--+
| This source file is subject to version 3.0 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is|
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.162.2.9 2005/08/05 14:00:47 hyanantha Exp $ */
+/* $Id: exif.c,v 1.162.2.10 2005/10/09 14:38:07 helly Exp $ */
/* ToDos
*
@@ -115,7 +115,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.162.2.9 2005/08/05 14:00:47
hyanantha Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.162.2.10 2005/10/09 14:38:07 helly
Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3032,6 +3032,12 @@
}
}
/*
+* Ignore IFD2 if it purportedly exists
+*/
+ if (section_index == SECTION_THUMBNAIL) {
+ return FALSE;
+ }
+ /*
* Hack to make it process IDF1 I hope
* There are 2 IDFs, the second one holds the keys (0x0201 and 0x0202)
to the thumbnail
*/
http://cvs.php.net/co.php/php-src/ext/exif/tests/bug34704.phpt?r=1.1p=1
Index: php-src/ext/exif/tests/bug34704.phpt
+++ php-src/ext/exif/tests/bug34704.phpt
--TEST--
Bug # 34704 (Infinite recursion due to corrupt JPEG)
--SKIPIF--
?php if (!extension_loaded('exif')) print 'skip exif extension not
available';?
--INI--
magic_quotes_runtime=0
output_handler=
zlib.output_compression=0
--FILE--
?php
$infile = dirname(__FILE__).'/bug34704.jpg';
var_dump(exif_read_data($infile));
?
===DONE===
--EXPECT--
array(7) {
[FileName]=
string(12) bug34704.jpg
[FileDateTime]=
int(1128866682)
[FileSize]=
int(9976)
[FileType]=
int(2)
[MimeType]=
string(10) image/jpeg
[SectionsFound]=
string(4) IFD0
[COMPUTED]=
array(5) {
[html]=
string(24) width=386 height=488
[Height]=
int(488)
[Width]=
int(386)
[IsColor]=
int(1)
[ByteOrderMotorola]=
int(0)
}
}
===DONE===
--
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) / NEWS /sapi/cgi cgi_main.c /sapi/cli php_cli.c
johannesThu Oct 6 16:36:46 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/sapi/cgi cgi_main.c /php-src/sapi/cli php_cli.c Log: - MFH: Fix #34557 php -m exits with error 1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.490r2=1.1760.2.491ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.490 php-src/NEWS:1.1760.2.491 --- php-src/NEWS:1.1760.2.490 Tue Oct 4 16:49:33 2005 +++ php-src/NEWSThu Oct 6 16:36:42 2005 @@ -7,6 +7,7 @@ - Fixed bug #34643 (wsdl default value has no effect). (Dmitry) - Fixed bug #34617 (zend_deactivate: objects_store used after zend_objects_store_destroy is called). (Dmitry) +- Fixed bug #34557 (php -m exits with error 1). (Johannes) - Fixed bug #34505 (Possible memory corruption when unmangling properties with empty names). (Tony) - Fixed bug #34478 (Incorrect parsing of url's fragment (#...)). (Dmitry) http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.256.2.6r2=1.256.2.7ty=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.256.2.6 php-src/sapi/cgi/cgi_main.c:1.256.2.7 --- php-src/sapi/cgi/cgi_main.c:1.256.2.6 Thu Apr 28 10:24:21 2005 +++ php-src/sapi/cgi/cgi_main.c Thu Oct 6 16:36:44 2005 @@ -20,7 +20,7 @@ +--+ */ -/* $Id: cgi_main.c,v 1.256.2.6 2005/04/28 14:24:21 sniper Exp $ */ +/* $Id: cgi_main.c,v 1.256.2.7 2005/10/06 20:36:44 johannes Exp $ */ #include php.h #include php_globals.h @@ -1374,7 +1374,7 @@ } php_print_info(0x TSRMLS_CC); php_end_ob_buffers(1 TSRMLS_CC); - exit(1); + exit(0); break; case 'l': /* syntax check mode */ @@ -1392,7 +1392,7 @@ print_extensions(TSRMLS_C); php_printf(\n); php_end_ob_buffers(1 TSRMLS_CC); - exit(1); + exit(0); break; #if 0 /* not yet operational, see also below ... */ @@ -1425,7 +1425,7 @@ php_printf(PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s, PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version()); #endif php_end_ob_buffers(1 TSRMLS_CC); - exit(1); + exit(0); break; case 'w': http://cvs.php.net/diff.php/php-src/sapi/cli/php_cli.c?r1=1.113.2.2r2=1.113.2.3ty=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.113.2.2 php-src/sapi/cli/php_cli.c:1.113.2.3 --- php-src/sapi/cli/php_cli.c:1.113.2.2Tue Mar 22 10:09:20 2005 +++ php-src/sapi/cli/php_cli.c Thu Oct 6 16:36:45 2005 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: php_cli.c,v 1.113.2.2 2005/03/22 15:09:20 tony2001 Exp $ */ +/* $Id: php_cli.c,v 1.113.2.3 2005/10/06 20:36:45 johannes Exp $ */ #include php.h #include php_globals.h @@ -665,8 +665,9 @@ php_output_activate(TSRMLS_C); php_cli_usage(argv[0]); php_end_ob_buffers(1 TSRMLS_CC); - exit_status=1; - goto err; + exit_status=0; + zend_ini_deactivate(TSRMLS_C); + goto out_err; case 'i': /* php info quit */ @@ -675,7 +676,7 @@ } php_print_info(0x TSRMLS_CC); php_end_ob_buffers(1 TSRMLS_CC); - exit_status=1; + exit_status=0; goto out; case 'm': /* list compiled in modules */ @@ -687,8 +688,9 @@ print_extensions(TSRMLS_C); php_printf(\n); php_end_ob_buffers(1 TSRMLS_CC); - exit_status=1; - goto err; + exit_status=0; + zend_ini_deactivate(TSRMLS_C); + goto out_err; case 'v': /* show php version
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/xmlrpc xmlrpc-epi-php.c
tony2001Tue Oct 4 07:19:11 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
MHB5.1: fix #32179 (xmlrpc_encode() segfaults with recursive references)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.488r2=1.1760.2.489ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.488 php-src/NEWS:1.1760.2.489
--- php-src/NEWS:1.1760.2.488 Mon Oct 3 05:13:58 2005
+++ php-src/NEWSTue Oct 4 07:19:10 2005
@@ -14,6 +14,7 @@
- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
- Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler).
(Dmitry, Alex)
+- Fixed bug #32179 (xmlrpc_encode() segfaults with recursive references).
(Tony)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.37r2=1.37.2.1ty=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.37
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.37.2.1
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.37Thu Jan 8 03:17:47 2004
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Tue Oct 4 07:19:11 2005
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.37 2004/01/08 08:17:47 andi Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.37.2.1 2005/10/04 11:19:11 tony2001 Exp $ */
/**
* BUGS: *
@@ -520,28 +520,41 @@
unsigned long num_index;
zval** pIter;
char* my_key;
+ HashTable *ht = NULL;
+ ht = HASH_OF(val);
+ if (ht ht-nApplyCount 1) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR, XML-RPC
doesn't support circular references);
+ return NULL;
+ }
+
convert_to_array(val);
-
xReturn = XMLRPC_CreateVector(key,
determine_vector_type(Z_ARRVAL_P(val)));
zend_hash_internal_pointer_reset(Z_ARRVAL_P(val));
- while(1) {
+ while(zend_hash_get_current_data(Z_ARRVAL_P(val),
(void**)pIter) == SUCCESS) {
int res = my_zend_hash_get_current_key(Z_ARRVAL_P(val),
my_key, num_index);
- if(res == HASH_KEY_IS_LONG) {
-if(zend_hash_get_current_data(Z_ARRVAL_P(val),
(void**)pIter) == SUCCESS) {
- XMLRPC_AddValueToVector(xReturn,
PHP_to_XMLRPC_worker(0, *pIter, depth++));
-}
- }
- else if(res == HASH_KEY_NON_EXISTANT) {
-break;
+
+ switch (res) {
+ case HASH_KEY_NON_EXISTANT:
+ break;
+ case HASH_KEY_IS_STRING:
+ case HASH_KEY_IS_LONG:
+ ht = HASH_OF(*pIter);
+ if (ht) {
+ ht-nApplyCount++;
+ }
+ if (res == HASH_KEY_IS_LONG) {
+ XMLRPC_AddValueToVector(xReturn,
PHP_to_XMLRPC_worker(0, *pIter, depth++));
+ }
+ else {
+ XMLRPC_AddValueToVector(xReturn,
PHP_to_XMLRPC_worker(my_key, *pIter, depth++));
+ }
+ if (ht) {
+ ht-nApplyCount--;
+ }
+ break;
}
- else if(res == HASH_KEY_IS_STRING) {
-if(zend_hash_get_current_data(Z_ARRVAL_P(val),
(void**)pIter) == SUCCESS) {
- XMLRPC_AddValueToVector(xReturn,
PHP_to_XMLRPC_worker(my_key, *pIter, depth++));
-}
- }
-
zend_hash_move_forward(Z_ARRVAL_P(val));
}
}
--
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) / NEWS /ext/standard array.c
tony2001Tue Oct 4 16:49:36 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard array.c
Log:
MFH: fix #34723 (array_count_values() strips leading zeroes)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.489r2=1.1760.2.490ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.489 php-src/NEWS:1.1760.2.490
--- php-src/NEWS:1.1760.2.489 Tue Oct 4 07:19:10 2005
+++ php-src/NEWSTue Oct 4 16:49:33 2005
@@ -2,6 +2,7 @@
|||
?? ??? , PHP 5.0.6
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34723 (array_count_values() strips leading zeroes). (Tony)
- Fixed bug #34678 (__call(), is_callable() and static methods). (Dmitry)
- Fixed bug #34643 (wsdl default value has no effect). (Dmitry)
- Fixed bug #34617 (zend_deactivate: objects_store used after
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.27r2=1.266.2.28ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.27
php-src/ext/standard/array.c:1.266.2.28
--- php-src/ext/standard/array.c:1.266.2.27 Mon Oct 3 10:04:41 2005
+++ php-src/ext/standard/array.cTue Oct 4 16:49:35 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.27 2005/10/03 14:04:41 iliaa Exp $ */
+/* $Id: array.c,v 1.266.2.28 2005/10/04 20:49:35 tony2001 Exp $ */
#include php.h
#include php_ini.h
@@ -2491,8 +2491,9 @@
Z_LVAL_PP(tmp)++;
}
} else if (Z_TYPE_PP(entry) == IS_STRING) {
- /* make sure our array does not end up with numeric
string keys */
- if (is_numeric_string(Z_STRVAL_PP(entry),
Z_STRLEN_PP(entry), NULL, NULL, 0) == IS_LONG) {
+ /* make sure our array does not end up with numeric
string keys
+* but don't touch those strings that start with 0 */
+ if (!(Z_STRLEN_PP(entry) 1 Z_STRVAL_PP(entry)[0]
== '0') is_numeric_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), NULL,
NULL, 0) == IS_LONG) {
zval tmp_entry;
tmp_entry = **entry;
--
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) / NEWS /ext/soap php_schema.c /ext/soap/tests/bugs bug34453.phpt bug34453.wsdl xml2.xsd
dmitry Wed Sep 28 07:25:39 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/soap/tests/bugsbug34453.phpt bug34453.wsdl xml2.xsd
Modified files:
/php-srcNEWS
/php-src/ext/soap php_schema.c
Log:
Fixed bug #34453 (parsing http://www.w3.org/2001/xml.xsd exception)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.486r2=1.1760.2.487ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.486 php-src/NEWS:1.1760.2.487
--- php-src/NEWS:1.1760.2.486 Tue Sep 27 14:07:21 2005
+++ php-src/NEWSWed Sep 28 07:25:36 2005
@@ -8,6 +8,7 @@
- Fixed bug #34505 (Possible memory corruption when unmangling properties
with empty names). (Tony)
- Fixed bug #34478 (Incorrect parsing of url's fragment (#...)). (Dmitry)
+- Fixed bug #34453 (parsing http://www.w3.org/2001/xml.xsd exception). (Dmitry)
- Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
- Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler).
http://cvs.php.net/diff.php/php-src/ext/soap/php_schema.c?r1=1.49.2.6r2=1.49.2.7ty=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.49.2.6
php-src/ext/soap/php_schema.c:1.49.2.7
--- php-src/ext/soap/php_schema.c:1.49.2.6 Wed Jun 1 10:42:50 2005
+++ php-src/ext/soap/php_schema.c Wed Sep 28 07:25:38 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_schema.c,v 1.49.2.6 2005/06/01 14:42:50 dmitry Exp $ */
+/* $Id: php_schema.c,v 1.49.2.7 2005/09/28 11:25:38 dmitry Exp $ */
#include php_soap.h
#include libxml/uri.h
@@ -534,10 +534,6 @@
if (node_is_equal(trav,simpleType)) {
sdlTypePtr newType, *tmp;
- if (memberTypes != NULL) {
- soap_error0(E_ERROR, Parsing Schema: union has
both 'memberTypes' attribute and subtypes);
- }
-
newType = emalloc(sizeof(sdlType));
memset(newType, 0, sizeof(sdlType));
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug34453.phpt?r=1.1p=1
Index: php-src/ext/soap/tests/bugs/bug34453.phpt
+++ php-src/ext/soap/tests/bugs/bug34453.phpt
--TEST--
Bug #29839 incorrect convert (xml:lang to lang)
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
function EchoString($s) {
return $s;
}
class LocalSoapClient extends SoapClient {
function __construct($wsdl, $options) {
parent::__construct($wsdl, $options);
$this-server = new SoapServer($wsdl, $options);
$this-server-addFunction('EchoString');
}
function __doRequest($request, $location, $action, $version) {
ob_start();
$this-server-handle($request);
$response = ob_get_contents();
ob_end_clean();
return $response;
}
}
$client = new LocalSoapClient(dirname(__FILE__)./bug34453.wsdl,
array(trace=1));
$client-EchoString(array(value=hello,lang=en));
echo $client-__getLastRequest();
echo $client-__getLastResponse();
echo ok\n;
?
--EXPECT--
?xml version=1.0 encoding=UTF-8?
SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://test-uri;SOAP-ENV:Bodystring
xml:lang=enns1:valuehello/ns1:value/string/SOAP-ENV:Body/SOAP-ENV:Envelope
?xml version=1.0 encoding=UTF-8?
SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://test-uri;SOAP-ENV:Bodystring
xml:lang=enns1:valuehello/ns1:value/string/SOAP-ENV:Body/SOAP-ENV:Envelope
ok
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug34453.wsdl?r=1.1p=1
Index: php-src/ext/soap/tests/bugs/bug34453.wsdl
+++ php-src/ext/soap/tests/bugs/bug34453.wsdl
definitions xmlns=http://schemas.xmlsoap.org/wsdl/;
xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/;
xmlns:xs=http://www.w3.org/2001/XMLSchema; xmlns:tns=http://test-uri;
targetNamespace=http://test-uri;
types
xs:schema targetNamespace=http://test-uri;
elementFormDefault=qualified
import
namespace=http://www.w3.org/XML/1998/namespace; schemaLocation=xml2.xsd /
complexType name=LocalizedString
sequence
element name=value
type=xsd:string/
/sequence
attribute ref=xml:lang use=required/
/complexType
/xs:schema
/types
message name=EchoStringRequest
part name=string type=tns:LocalizedString/
/message
message name=EchoStringResponse
part name=string type=tns:LocalizedString/
/message
portType name=AWSProductDataPortType
operation
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug34643.phpt bug34643.wsdl
dmitry Tue Sep 27 11:26:26 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/soap/tests/bugsbug34643.phpt bug34643.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #34643 (wsdl default value has no effect)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.484r2=1.1760.2.485ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.484 php-src/NEWS:1.1760.2.485
--- php-src/NEWS:1.1760.2.484 Tue Sep 20 07:55:32 2005
+++ php-src/NEWSTue Sep 27 11:26:24 2005
@@ -2,6 +2,7 @@
|||
?? ??? , PHP 5.0.6
- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
+- Fixed bug #34643 (wsdl default value has no effect). (Dmitry)
- Fixed bug #34505 (Possible memory corruption when unmangling properties
with empty names). (Tony)
- Fixed bug #34478 (Incorrect parsing of url's fragment (#...)). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.43r2=1.110.2.44ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.43 php-src/ext/soap/soap.c:1.110.2.44
--- php-src/ext/soap/soap.c:1.110.2.43 Mon Sep 12 04:26:05 2005
+++ php-src/ext/soap/soap.c Tue Sep 27 11:26:25 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.110.2.43 2005/09/12 08:26:05 dmitry Exp $ */
+/* $Id: soap.c,v 1.110.2.44 2005/09/27 15:26:25 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -4004,9 +4004,21 @@
{
xmlNodePtr xmlParam;
encodePtr enc;
+ zval defval;
if (param != NULL) {
enc = param-encode;
+ if (val == NULL || Z_TYPE_P(val) == IS_NULL) {
+ if (param-element) {
+ if (param-element-fixed) {
+ ZVAL_STRING(defval,
param-element-fixed, 0);
+ val = defval;
+ } else if (param-element-def
!param-element-nillable) {
+ ZVAL_STRING(defval,
param-element-def, 0);
+ val = defval;
+ }
+ }
+ }
} else {
enc = NULL;
}
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug34643.phpt?r=1.1p=1
Index: php-src/ext/soap/tests/bugs/bug34643.phpt
+++ php-src/ext/soap/tests/bugs/bug34643.phpt
--TEST--
Bug #34643 (wsdl default value)
--SKIPIF--
?php require_once('skipif.inc'); ?
--INI--
soap.wsdl_cache_enabled=0
--FILE--
?php
ini_set(soap.wsdl_cache_enabled, 0);
class fp {
public function get_it($opt=zzz) {
return $opt;
}
}
class LocalSoapClient extends SoapClient {
function __construct($wsdl, $options) {
parent::__construct($wsdl, $options);
$this-server = new SoapServer($wsdl, $options);
$this-server-setClass('fp');
}
function __doRequest($request, $location, $action, $version) {
ob_start();
$this-server-handle($request);
$response = ob_get_contents();
ob_end_clean();
return $response;
}
}
$cl = new LocalSoapClient(dirname(__FILE__).'/bug34643.wsdl',
array(trace=1));
print_r($cl-__getFunctions());
echo $cl-get_it(aaa).\n;
echo $cl-get_it().\n;
?
--EXPECT--
Array
(
[0] = string get_it(string $opt)
)
aaa
zzz
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug34643.wsdl?r=1.1p=1
Index: php-src/ext/soap/tests/bugs/bug34643.wsdl
+++ php-src/ext/soap/tests/bugs/bug34643.wsdl
?xml version='1.0' encoding='UTF-8'?
definitions name=wsdl targetNamespace=urn:wsdl
xmlns:typens=urn:wsdl xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/;
xmlns:soapenc=http://schemas.xmlsoap.org/soap/encoding/;
xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/;
xmlns=http://schemas.xmlsoap.org/wsdl/;
types
xsd:schema xmlns=http://www.w3.org/2001/XMLSchema;
targetNamespace=urn:wsdl
xsd:element name=opt type=xsd:string default=zzz
/
/xsd:schema
/types
message name=get_it
part name=opt element=typens:opt/
/message
message name=get_itResponse
part name=return type=xsd:string/
/message
portType name=fpPortType
operation name=get_it
input message=typens:get_it/
output message=typens:get_itResponse/
/operation
/portType
binding name=fpBinding type=typens:fpPortType
soap:binding style=rpc
transport=http://schemas.xmlsoap.org/soap/http/
operation name=get_it
soap:operation
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
tony2001Tue Sep 20 07:55:35 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.483r2=1.1760.2.484ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.483 php-src/NEWS:1.1760.2.484 --- php-src/NEWS:1.1760.2.483 Mon Sep 19 15:11:16 2005 +++ php-src/NEWSTue Sep 20 07:55:32 2005 @@ -2,6 +2,8 @@ ||| ?? ??? , PHP 5.0.6 - Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus) +- Fixed bug #34505 (Possible memory corruption when unmangling properties + with empty names). (Tony) - Fixed bug #34478 (Incorrect parsing of url's fragment (#...)). (Dmitry) - Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony) - Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry) -- 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) / NEWS /ext/spl spl_array.c
tony2001Mon Sep 19 14:51:38 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/splspl_array.c
Log:
fix #34548 (method append() in class extended from ArrayObject crashes PHP)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.481r2=1.1760.2.482ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.481 php-src/NEWS:1.1760.2.482
--- php-src/NEWS:1.1760.2.481 Fri Sep 16 19:56:29 2005
+++ php-src/NEWSMon Sep 19 14:51:34 2005
@@ -28,6 +28,8 @@
- Fixed segfaults when CURL callback functions throw exception. (Tony)
- Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and
#33295. (Mike Bretz)
+- Fixed bug #34548 (Method append() in class extended from ArrayObject crashes
+ PHP). (Tony)
- Fixed bug #34307 (on_modify handler not called to set the default value if
setting from php.ini was invalid). (Andrei)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.49.2.7r2=1.49.2.8ty=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.49.2.7
php-src/ext/spl/spl_array.c:1.49.2.8
--- php-src/ext/spl/spl_array.c:1.49.2.7Mon Mar 21 15:13:54 2005
+++ php-src/ext/spl/spl_array.c Mon Sep 19 14:51:37 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.49.2.7 2005/03/21 20:13:54 helly Exp $ */
+/* $Id: spl_array.c,v 1.49.2.8 2005/09/19 18:51:37 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -304,10 +304,19 @@
{
spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
long index;
- zval *rv;
+ int free_offset;
if (check_inherited intern-fptr_offset_set) {
- zend_call_method_with_2_params(object, Z_OBJCE_P(object),
intern-fptr_offset_set, offsetSet, rv, offset, value);
+ if (!offset) {
+ ALLOC_INIT_ZVAL(offset);
+ free_offset = 1;
+ } else {
+ free_offset = 0;
+ }
+ zend_call_method_with_2_params(object, Z_OBJCE_P(object),
intern-fptr_offset_set, offsetSet, NULL, offset, value);
+ if (free_offset) {
+ zval_ptr_dtor(offset);
+ }
return;
}
@@ -333,6 +342,10 @@
value-refcount++;
zend_hash_index_update(HASH_OF(intern-array), index,
(void**)value, sizeof(void*), NULL);
return;
+case IS_NULL:
+ value-refcount++;
+ zend_hash_next_index_insert(HASH_OF(intern-array),
(void**)value, sizeof(void*), NULL);
+ return;
default:
zend_error(E_WARNING, Illegal offset type);
return;
--
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) / NEWS /ext/spl php_spl.c spl.php spl_iterators.c spl_iterators.h /ext/spl/examples directorytreeiterator.inc /ext/spl/internal cachingrecursiveiterator.inc recursiv
helly Mon Sep 19 15:11:19 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/spl/internal recursivecachingiterator.inc
Modified files:
/php-srcNEWS
/php-src/ext/splphp_spl.c spl.php spl_iterators.c spl_iterators.h
/php-src/ext/spl/examples directorytreeiterator.inc
/php-src/ext/spl/internal cachingrecursiveiterator.inc
Log:
- MFH Renamed CachingRecursiveIterator to RecursiveCachingIterator.
# After talking to other developers it came clear that adding an upgrade
# path by 'class CachingRecursiveIterator extends RecursiveCachingIterator'
# with its constructor issuing an E_NOTICE seems a good idea.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.482r2=1.1760.2.483ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.482 php-src/NEWS:1.1760.2.483
--- php-src/NEWS:1.1760.2.482 Mon Sep 19 14:51:34 2005
+++ php-src/NEWSMon Sep 19 15:11:16 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? , PHP 5.0.6
+- Renamed CachingRecursiveIterator to RecursiveCachingIterator. (Marcus)
- Fixed bug #34478 (Incorrect parsing of url's fragment (#...)). (Dmitry)
- Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.28.2.1r2=1.28.2.2ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.28.2.1 php-src/ext/spl/php_spl.c:1.28.2.2
--- php-src/ext/spl/php_spl.c:1.28.2.1 Wed Aug 24 06:18:15 2005
+++ php-src/ext/spl/php_spl.c Mon Sep 19 15:11:18 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.28.2.1 2005/08/24 10:18:15 johannes Exp $ */
+/* $Id: php_spl.c,v 1.28.2.2 2005/09/19 19:11:18 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -160,11 +160,11 @@
SPL_ADD_CLASS(ArrayIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(ArrayObject, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(CachingIterator, z_list, sub, allow, ce_flags); \
- SPL_ADD_CLASS(CachingRecursiveIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(DirectoryIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(FilterIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(LimitIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(ParentIterator, z_list, sub, allow, ce_flags); \
+ SPL_ADD_CLASS(RecursiveCachingIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(RecursiveDirectoryIterator, z_list, sub, allow,
ce_flags); \
SPL_ADD_CLASS(RecursiveIterator, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(RecursiveIteratorIterator, z_list, sub, allow, ce_flags);
\
http://cvs.php.net/diff.php/php-src/ext/spl/spl.php?r1=1.25.2.2r2=1.25.2.3ty=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.25.2.2 php-src/ext/spl/spl.php:1.25.2.3
--- php-src/ext/spl/spl.php:1.25.2.2Fri Oct 1 06:36:50 2004
+++ php-src/ext/spl/spl.php Mon Sep 19 15:11:18 2005
@@ -424,7 +424,7 @@
/** \ingroup SPL
* \brief The recursive version of the CachingIterator.
*/
-class CachingRecursiveIterator extends CachingIterator implements
RecursiveIterator
+class RecursiveCachingIterator extends CachingIterator implements
RecursiveIterator
{
/** Construct an instance form a RecursiveIterator.
*
http://cvs.php.net/diff.php/php-src/ext/spl/spl_iterators.c?r1=1.38.2.10r2=1.38.2.11ty=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.38.2.10
php-src/ext/spl/spl_iterators.c:1.38.2.11
--- php-src/ext/spl/spl_iterators.c:1.38.2.10 Sat Mar 12 18:12:36 2005
+++ php-src/ext/spl/spl_iterators.c Mon Sep 19 15:11:18 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.38.2.10 2005/03/12 23:12:36 helly Exp $ */
+/* $Id: spl_iterators.c,v 1.38.2.11 2005/09/19 19:11:18 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -44,6 +44,7 @@
zend_class_entry *spl_ce_LimitIterator;
zend_class_entry *spl_ce_CachingIterator;
zend_class_entry *spl_ce_CachingRecursiveIterator;
+zend_class_entry *spl_ce_RecursiveCachingIterator;
function_entry spl_funcs_RecursiveIterator[] = {
SPL_ABSTRACT_ME(RecursiveIterator, hasChildren, NULL)
@@ -586,7 +587,7 @@
break;
}
case DIT_CachingIterator:
- case DIT_CachingRecursiveIterator: {
+ case DIT_RecursiveCachingIterator: {
long flags = CIT_CALL_TOSTRING;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
O|l, zobject, ce_inner,
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/soap php_http.c
dmitry Fri Sep 16 11:48:52 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap php_http.c
Log:
Fixed bug #34478 (Incorrect parsing of url's fragment (#...))
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.479r2=1.1760.2.480ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.479 php-src/NEWS:1.1760.2.480
--- php-src/NEWS:1.1760.2.479 Tue Sep 13 05:21:36 2005
+++ php-src/NEWSFri Sep 16 11:48:51 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? , PHP 5.0.6
+- Fixed bug #34478 (Incorrect parsing of url's fragment (#...)). (Dmitry)
- Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
- Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler).
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.55.2.19r2=1.55.2.20ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.55.2.19
php-src/ext/soap/php_http.c:1.55.2.20
--- php-src/ext/soap/php_http.c:1.55.2.19 Fri Jul 8 05:36:42 2005
+++ php-src/ext/soap/php_http.c Fri Sep 16 11:48:51 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.55.2.19 2005/07/08 09:36:42 dmitry Exp $ */
+/* $Id: php_http.c,v 1.55.2.20 2005/09/16 15:48:51 dmitry Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -428,6 +428,10 @@
smart_str_appendc(soap_headers, '?');
smart_str_appends(soap_headers, phpurl-query);
}
+ if (phpurl-fragment) {
+ smart_str_appendc(soap_headers, '#');
+ smart_str_appends(soap_headers, phpurl-fragment);
+ }
smart_str_append_const(soap_headers, HTTP/1.1\r\n
Host: );
smart_str_appends(soap_headers, phpurl-host);
@@ -584,6 +588,10 @@
smart_str_appendc(soap_headers, '?');
smart_str_appends(soap_headers, phpurl-query);
}
+ if (phpurl-fragment) {
+
smart_str_appendc(soap_headers, '#');
+
smart_str_appends(soap_headers, phpurl-fragment);
+ }
if (zend_hash_find(Z_ARRVAL_PP(digest),
qop, sizeof(qop), (void **)tmp) == SUCCESS
Z_TYPE_PP(tmp) == IS_STRING) {
/* TODO: Support for qop=auth-int */
--
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) / NEWS
tony2001Fri Sep 16 19:56:30 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.480r2=1.1760.2.481ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.480 php-src/NEWS:1.1760.2.481 --- php-src/NEWS:1.1760.2.480 Fri Sep 16 11:48:51 2005 +++ php-src/NEWSFri Sep 16 19:56:29 2005 @@ -47,6 +47,7 @@ - Fixed bug #34062 (Crash in catch block when many arguments are used). (Dmitry) - Fixed bug #33989 (extract($GLOBALS,EXTR_REFS) crashes PHP). (Dmitry) +- Fixed bug #33966 (Wrong use of reflectionproperty causes a segfault). (Tony) - Fixed bug #33940 (array_map() fails to pass by reference when called recursively). (Dmitry) - Fixed bug #33853 (php:function call __autoload with lowercase param). (Marcus) -- 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) / NEWS /ext/mysqli mysqli.c
tony2001Tue Sep 13 05:21:37 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mysqli mysqli.c
/php-srcNEWS
Log:
MFH: fix #34450 (Segfault when calling mysqli_close() in destructor)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.17r2=1.43.2.18ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.43.2.17
php-src/ext/mysqli/mysqli.c:1.43.2.18
--- php-src/ext/mysqli/mysqli.c:1.43.2.17 Mon Jun 27 14:22:00 2005
+++ php-src/ext/mysqli/mysqli.c Tue Sep 13 05:21:36 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.43.2.17 2005/06/27 18:22:00 tony2001 Exp $
+ $Id: mysqli.c,v 1.43.2.18 2005/09/13 09:21:36 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -130,9 +130,11 @@
static void mysqli_objects_destroy_object(void *object, zend_object_handle
handle TSRMLS_DC)
{
mysqli_object *intern = (mysqli_object *)object;
- MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern-ptr;
+ MYSQLI_RESOURCE *my_res;
zend_objects_destroy_object(object, handle TSRMLS_CC);
+
+ my_res = (MYSQLI_RESOURCE *)intern-ptr;
/* link object */
if (instanceof_function(intern-zo.ce, mysqli_link_class_entry
TSRMLS_CC)) {
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.478r2=1.1760.2.479ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.478 php-src/NEWS:1.1760.2.479
--- php-src/NEWS:1.1760.2.478 Tue Sep 13 02:10:34 2005
+++ php-src/NEWSTue Sep 13 05:21:36 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? , PHP 5.0.6
+- Fixed bug #34450 (Segfault when calling mysqli_close() in destructor). (Tony)
- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
- Fixed bug #34199 (if($obj)/if(!$obj) inconsistency because of cast handler).
(Dmitry, Alex)
--
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) / NEWS /ext/soap soap.c /ext/soap/tests/bugs bug34449.phpt
dmitry Mon Sep 12 04:26:06 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/soap/tests/bugsbug34449.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap soap.c
Log:
Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.476r2=1.1760.2.477ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.476 php-src/NEWS:1.1760.2.477
--- php-src/NEWS:1.1760.2.476 Mon Sep 5 08:00:19 2005
+++ php-src/NEWSMon Sep 12 04:26:04 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? , PHP 5.0.6
+- Fixed bug #34449 (ext/soap: XSD_ANYXML functionality not exposed). (Dmitry)
05 Sep 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.42r2=1.110.2.43ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.42 php-src/ext/soap/soap.c:1.110.2.43
--- php-src/ext/soap/soap.c:1.110.2.42 Wed Aug 17 13:04:37 2005
+++ php-src/ext/soap/soap.c Mon Sep 12 04:26:05 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.110.2.42 2005/08/17 17:04:37 sniper Exp $ */
+/* $Id: soap.c,v 1.110.2.43 2005/09/12 08:26:05 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -614,6 +614,7 @@
REGISTER_LONG_CONSTANT(XSD_POSITIVEINTEGER, XSD_POSITIVEINTEGER,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(XSD_NMTOKENS, XSD_NMTOKENS, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(XSD_ANYTYPE, XSD_ANYTYPE, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(XSD_ANYXML, XSD_ANYXML, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SOAP_ENC_OBJECT, SOAP_ENC_OBJECT, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SOAP_ENC_ARRAY, SOAP_ENC_ARRAY, CONST_CS |
CONST_PERSISTENT);
http://cvs.php.net/co.php/php-src/ext/soap/tests/bugs/bug34449.phpt?r=1.1p=1
Index: php-src/ext/soap/tests/bugs/bug34449.phpt
+++ php-src/ext/soap/tests/bugs/bug34449.phpt
--TEST--
Bug #34449 (ext/soap: XSD_ANYXML functionality not exposed)
--FILE--
?php
class TestSoapClient extends SoapClient {
function __doRequest($request, $location, $action, $version) {
echo $request\n;
exit;
}
}
$my_xml = arrayitem/item/item//array;
$client = new TestSoapClient(null, array('location' = 'test://', 'uri' =
'test://'));
$client-AnyFunction(new SoapVar($my_xml, XSD_ANYXML));
?
--EXPECT--
?xml version=1.0 encoding=UTF-8?
SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=test:// xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:AnyFunctionarrayitem/item/item//array/ns1:AnyFunction/SOAP-ENV:Body/SOAP-ENV:Envelope
--
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) / NEWS configure.in /main php_version.h
zeevMon Sep 5 06:41:14 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll 5.0.5 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.474r2=1.1760.2.475ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.474 php-src/NEWS:1.1760.2.475 --- php-src/NEWS:1.1760.2.474 Fri Sep 2 17:12:09 2005 +++ php-src/NEWSMon Sep 5 06:41:11 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -25 Aug 2005, PHP 5.0.5RC2 +05 Sep 2005, PHP 5.0.5 - Upgraded PCRE library to version 5.0. (Andrei) - Removed php_check_syntax() function which never worked properly. (Ilia) - Added new function mysqli_set_charset(). (Georg) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.57r2=1.514.2.58ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.57 php-src/configure.in:1.514.2.58 --- php-src/configure.in:1.514.2.57 Thu Aug 25 14:29:14 2005 +++ php-src/configure.inMon Sep 5 06:41:12 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.57 2005/08/25 18:29:14 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.58 2005/09/05 10:41:12 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=5 -EXTRA_VERSION=-dev +EXTRA_VERSION= 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.97.2.25r2=1.97.2.26ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.25 php-src/main/php_version.h:1.97.2.26 --- php-src/main/php_version.h:1.97.2.25Thu Aug 25 14:29:15 2005 +++ php-src/main/php_version.h Mon Sep 5 06:41:14 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.0.5-dev +#define PHP_EXTRA_VERSION +#define PHP_VERSION 5.0.5 -- 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) / NEWS configure.in /main php_version.h
zeevMon Sep 5 08:00:36 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll back to dev http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.475r2=1.1760.2.476ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.475 php-src/NEWS:1.1760.2.476 --- php-src/NEWS:1.1760.2.475 Mon Sep 5 06:41:11 2005 +++ php-src/NEWSMon Sep 5 08:00:19 2005 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? , PHP 5.0.6 + 05 Sep 2005, PHP 5.0.5 - Upgraded PCRE library to version 5.0. (Andrei) - Removed php_check_syntax() function which never worked properly. (Ilia) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.58r2=1.514.2.59ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.58 php-src/configure.in:1.514.2.59 --- php-src/configure.in:1.514.2.58 Mon Sep 5 06:41:12 2005 +++ php-src/configure.inMon Sep 5 08:00:24 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.58 2005/09/05 10:41:12 zeev Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.59 2005/09/05 12:00:24 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -40,8 +40,8 @@ MAJOR_VERSION=5 MINOR_VERSION=0 -RELEASE_VERSION=5 -EXTRA_VERSION= +RELEASE_VERSION=6 +EXTRA_VERSION=-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.97.2.26r2=1.97.2.27ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.26 php-src/main/php_version.h:1.97.2.27 --- php-src/main/php_version.h:1.97.2.26Mon Sep 5 06:41:14 2005 +++ php-src/main/php_version.h Mon Sep 5 08:00:35 2005 @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 -#define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.0.5 +#define PHP_RELEASE_VERSION 6 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.0.6-dev -- 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) / NEWS
sniper Fri Sep 2 17:12:10 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
Log:
BFN
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.473r2=1.1760.2.474ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.473 php-src/NEWS:1.1760.2.474
--- php-src/NEWS:1.1760.2.473 Fri Sep 2 03:46:38 2005
+++ php-src/NEWSFri Sep 2 17:12:09 2005
@@ -21,6 +21,8 @@
- Fixed segfaults when CURL callback functions throw exception. (Tony)
- Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and
#33295. (Mike Bretz)
+- Fixed bug #34307 (on_modify handler not called to set the default value if
+ setting from php.ini was invalid). (Andrei)
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
(Derick)
- Fixed bug #34299 (ReflectionClass::isInstantiable() returns true for abstract
--
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) / NEWS /ext/standard array.c /ext/standard/tests/array bug34227.phpt
dmitry Thu Sep 1 08:01:02 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/array bug34227.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #34277 (array_filter() crashes with references and objects)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.470r2=1.1760.2.471ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.470 php-src/NEWS:1.1760.2.471
--- php-src/NEWS:1.1760.2.470 Tue Aug 30 05:15:56 2005
+++ php-src/NEWSThu Sep 1 08:01:00 2005
@@ -25,6 +25,8 @@
(Derick)
- Fixed bug #34299 (ReflectionClass::isInstantiable() returns true for abstract
classes). (Marcus)
+- Fixed bug #34277 (array_filter() crashes with references and objects).
+ (Dmitry)
- Fixed bug #34078 (Reflection API problems in methods with boolean or
null default values). (Tony)
- Fixed bug #34064 (arr[] as param to function is allowed only if function
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.24r2=1.266.2.25ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.24
php-src/ext/standard/array.c:1.266.2.25
--- php-src/ext/standard/array.c:1.266.2.24 Sun Aug 21 14:36:33 2005
+++ php-src/ext/standard/array.cThu Sep 1 08:01:01 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.24 2005/08/21 18:36:33 zeev Exp $ */
+/* $Id: array.c,v 1.266.2.25 2005/09/01 12:01:01 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -3975,6 +3975,7 @@
PHP_FUNCTION(array_filter)
{
zval **input, **callback = NULL;
+ zval *array;
zval **operand;
zval **args[1];
zval *retval = NULL;
@@ -3994,6 +3995,7 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, The first argument
should be an array);
return;
}
+ array = *input;
if (ZEND_NUM_ARGS() 1) {
if (!zend_is_callable(*callback, 0, callback_name)) {
@@ -4005,13 +4007,13 @@
}
array_init(return_value);
- if (zend_hash_num_elements(Z_ARRVAL_PP(input)) == 0) {
+ if (zend_hash_num_elements(Z_ARRVAL_P(array)) == 0) {
return;
}
- for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(input), pos);
-zend_hash_get_current_data_ex(Z_ARRVAL_PP(input), (void
**)operand, pos) == SUCCESS;
-zend_hash_move_forward_ex(Z_ARRVAL_PP(input), pos)) {
+ for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(array), pos);
+zend_hash_get_current_data_ex(Z_ARRVAL_P(array), (void
**)operand, pos) == SUCCESS;
+zend_hash_move_forward_ex(Z_ARRVAL_P(array), pos)) {
if (callback) {
zend_fcall_info fci;
@@ -4044,7 +4046,7 @@
}
zval_add_ref(operand);
- switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(input),
string_key, string_key_len, num_key, 0, pos)) {
+ switch (zend_hash_get_current_key_ex(Z_ARRVAL_P(array),
string_key, string_key_len, num_key, 0, pos)) {
case HASH_KEY_IS_STRING:
zend_hash_update(Z_ARRVAL_P(return_value),
string_key, string_key_len, operand, sizeof(zval *), NULL);
break;
http://cvs.php.net/co.php/php-src/ext/standard/tests/array/bug34227.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/array/bug34227.phpt
+++ php-src/ext/standard/tests/array/bug34227.phpt
--TEST--
Bug #34277 (array_filter() crashes with references and objects)
--FILE--
?php
class C
{
function m1()
{
$this-m2();
}
function m2()
{
$this-m3();
}
function m3()
{
$this-m4();
}
function m4()
{
$this-m5();
}
function m5()
{
$this-m6();
}
function m6()
{
$this-m7();
}
function m7()
{
$this-m8();
}
function m8()
{
$this-m9();
}
function m9()
{
$this-m10();
}
function m10()
{
$this-m11(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
}
function m11($a1, $a2, $a3, $a4, $a5, $a6, $a7, $a8, $a9, $a10)
{
$arr = explode('a', 'b');
}
}
function f($str)
{
$obj = new C;
$obj-m1();
return TRUE;
}
function p5($a1, $a2, $a3, $a4, $a5, $a6, $a7, $a8, $a9, $a10, $a11, $a12)
{
$ret = array_filter(array(0), 'f');
}
function p4()
{
p5(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12);
}
function p3()
{
p4();
}
function p2()
{
p3();
}
function p1()
{
p2();
}
p1();
echo ok\n;
?
--EXPECT--
ok
--
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) / NEWS
helly Tue Aug 30 02:48:46 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.468r2=1.1760.2.469ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.468 php-src/NEWS:1.1760.2.469 --- php-src/NEWS:1.1760.2.468 Thu Aug 25 13:10:23 2005 +++ php-src/NEWSTue Aug 30 02:48:41 2005 @@ -21,6 +21,8 @@ - Fixed segfaults when CURL callback functions throw exception. (Tony) - Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and #33295. (Mike Bretz) +- Fixed bug #34299 (ReflectionClass::isInstantiable() returns true for abstract + classes). (Marcus) - Fixed bug #34078 (Reflection API problems in methods with boolean or null default values). (Tony) - Fixed bug #34064 (arr[] as param to function is allowed only if function -- 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) / NEWS /ext/standard datetime.c
derick Tue Aug 30 05:15:58 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard datetime.c
Log:
- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.469r2=1.1760.2.470ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.469 php-src/NEWS:1.1760.2.470
--- php-src/NEWS:1.1760.2.469 Tue Aug 30 02:48:41 2005
+++ php-src/NEWSTue Aug 30 05:15:56 2005
@@ -21,6 +21,8 @@
- Fixed segfaults when CURL callback functions throw exception. (Tony)
- Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and
#33295. (Mike Bretz)
+- Fixed bug #34302 (date('W') do not return leading zeros for week 1 to 9).
+ (Derick)
- Fixed bug #34299 (ReflectionClass::isInstantiable() returns true for abstract
classes). (Marcus)
- Fixed bug #34078 (Reflection API problems in methods with boolean or
http://cvs.php.net/diff.php/php-src/ext/standard/datetime.c?r1=1.121.2.5r2=1.121.2.6ty=u
Index: php-src/ext/standard/datetime.c
diff -u php-src/ext/standard/datetime.c:1.121.2.5
php-src/ext/standard/datetime.c:1.121.2.6
--- php-src/ext/standard/datetime.c:1.121.2.5 Thu Apr 14 09:31:44 2005
+++ php-src/ext/standard/datetime.c Tue Aug 30 05:15:58 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: datetime.c,v 1.121.2.5 2005/04/14 13:31:44 iliaa Exp $ */
+/* $Id: datetime.c,v 1.121.2.6 2005/08/30 09:15:58 derick Exp $ */
#include php.h
#include zend_operators.h
@@ -657,7 +657,7 @@
wk = (yd + 6 - wd + fd) / 7 - (fd 3);
}
- sprintf(tmp_buff, %d, wk); /* SAFE */
+ sprintf(tmp_buff, %02d, wk); /* SAFE */
strcat(Z_STRVAL_P(return_value), tmp_buff);
break;
--
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) / NEWS configure.in /main php_version.h
zeevThu Aug 25 13:10:24 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in /php-src/main php_version.h Log: Roll RC2 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.467r2=1.1760.2.468ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.467 php-src/NEWS:1.1760.2.468 --- php-src/NEWS:1.1760.2.467 Sun Aug 21 19:01:23 2005 +++ php-src/NEWSThu Aug 25 13:10:23 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -21 Aug 2005, PHP 5.0.5RC1 +25 Aug 2005, PHP 5.0.5RC2 - Upgraded PCRE library to version 5.0. (Andrei) - Removed php_check_syntax() function which never worked properly. (Ilia) - Added new function mysqli_set_charset(). (Georg) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.55r2=1.514.2.56ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.55 php-src/configure.in:1.514.2.56 --- php-src/configure.in:1.514.2.55 Wed Jul 27 07:44:08 2005 +++ php-src/configure.inThu Aug 25 13:10:23 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.55 2005/07/27 11:44:08 hyanantha Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.56 2005/08/25 17:10:23 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=5 MINOR_VERSION=0 RELEASE_VERSION=5 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC2 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.97.2.23r2=1.97.2.24ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.97.2.23 php-src/main/php_version.h:1.97.2.24 --- php-src/main/php_version.h:1.97.2.23Wed Mar 30 17:24:52 2005 +++ php-src/main/php_version.h Thu Aug 25 13:10:24 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 5 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 5.0.5-dev +#define PHP_EXTRA_VERSION RC2 +#define PHP_VERSION 5.0.5RC2 -- 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) / NEWS /ext/standard array.c basic_functions.c basic_functions.h
zeevSun Aug 21 14:36:35 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard array.c basic_functions.c basic_functions.h
Log:
Backport Mike's patch for user sort functions
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.464r2=1.1760.2.465ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.464 php-src/NEWS:1.1760.2.465
--- php-src/NEWS:1.1760.2.464 Wed Aug 17 07:53:59 2005
+++ php-src/NEWSSun Aug 21 14:36:32 2005
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2005, PHP 5.0.5
+- Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and
+ #33295. (Mike Bretz)
- Upgraded PCRE library to version 5.0. (Andrei)
- Removed php_check_syntax() function which never worked properly. (Ilia)
- Added new function mysqli_set_charset(). (Georg)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.23r2=1.266.2.24ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.23
php-src/ext/standard/array.c:1.266.2.24
--- php-src/ext/standard/array.c:1.266.2.23 Wed Aug 10 04:23:52 2005
+++ php-src/ext/standard/array.cSun Aug 21 14:36:33 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.23 2005/08/10 08:23:52 dmitry Exp $ */
+/* $Id: array.c,v 1.266.2.24 2005/08/21 18:36:33 zeev Exp $ */
#include php.h
#include php_ini.h
@@ -578,43 +578,66 @@
}
}
-/* check is comparison function is valid */
+/* check if comparison function is valid */
#define PHP_ARRAY_CMP_FUNC_CHECK(func_name)\
if (!zend_is_callable(*func_name, 0, NULL)) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid comparison
function.);\
+ BG(user_compare_fci_cache) = old_user_compare_fci_cache; \
BG(user_compare_func_name) = old_compare_func; \
RETURN_FALSE; \
} \
+/* clear FCI cache otherwise : for example the same or other array with
+ (partly) the same key values has been sorted with uasort() or
+ other sorting function the comparison is cached, however the the name
+ of the function for comparison is not respected. see bug #28739 AND
#33295
+
+ following defines will assist in backup / restore values.
+*/
+
+#define PHP_ARRAY_CMP_FUNC_VARS \
+ zval **old_compare_func; \
+ zend_fcall_info_cache old_user_compare_fci_cache
+
+#define PHP_ARRAY_CMP_FUNC_BACKUP() \
+ old_compare_func = BG(user_compare_func_name); \
+ old_user_compare_fci_cache = BG(user_compare_fci_cache); \
+ BG(user_compare_fci_cache) = empty_fcall_info_cache
+
+#define PHP_ARRAY_CMP_FUNC_RESTORE() \
+BG(user_compare_fci_cache) = old_user_compare_fci_cache; \
+BG(user_compare_func_name) = old_compare_func
+
+
/* {{{ proto bool usort(array array_arg, string cmp_function)
Sort an array by values using a user-defined comparison function */
PHP_FUNCTION(usort)
{
zval **array;
- zval **old_compare_func;
HashTable *target_hash;
+ PHP_ARRAY_CMP_FUNC_VARS;
+
+ PHP_ARRAY_CMP_FUNC_BACKUP();
- old_compare_func = BG(user_compare_func_name);
- BG(user_compare_fci_cache) = empty_fcall_info_cache;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, array,
BG(user_compare_func_name)) == FAILURE) {
- BG(user_compare_func_name) = old_compare_func;
+ PHP_ARRAY_CMP_FUNC_RESTORE();
WRONG_PARAM_COUNT;
}
target_hash = HASH_OF(*array);
if (!target_hash) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, The argument
should be an array);
- BG(user_compare_func_name) = old_compare_func;
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
PHP_ARRAY_CMP_FUNC_CHECK(BG(user_compare_func_name))
if (zend_hash_sort(target_hash, zend_qsort, array_user_compare, 1
TSRMLS_CC) == FAILURE) {
- BG(user_compare_func_name) = old_compare_func;
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_FALSE;
}
- BG(user_compare_func_name) = old_compare_func;
+ PHP_ARRAY_CMP_FUNC_RESTORE();
RETURN_TRUE;
}
/* }}} */
@@ -624,29 +647,30 @@
PHP_FUNCTION(uasort)
{
zval **array;
- zval **old_compare_func;
HashTable *target_hash;
+ PHP_ARRAY_CMP_FUNC_VARS;
+
+ PHP_ARRAY_CMP_FUNC_BACKUP();
- old_compare_func = BG(user_compare_func_name);
- BG(user_compare_fci_cache) = empty_fcall_info_cache;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, array,
BG(user_compare_func_name)) == FAILURE) {
- BG(user_compare_func_name) =
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS
zeevSun Aug 21 14:37:29 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: Roll 5.0.5RC1 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.465r2=1.1760.2.466ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.465 php-src/NEWS:1.1760.2.466 --- php-src/NEWS:1.1760.2.465 Sun Aug 21 14:36:32 2005 +++ php-src/NEWSSun Aug 21 14:37:28 2005 @@ -1,6 +1,6 @@ PHPNEWS ||| -?? ??? 2005, PHP 5.0.5 +21 Aug 2005, PHP 5.0.5RC1 - Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and #33295. (Mike Bretz) - Upgraded PCRE library to version 5.0. (Andrei) -- 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) / NEWS
sniper Sun Aug 21 19:01:24 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: reorder http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.466r2=1.1760.2.467ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.466 php-src/NEWS:1.1760.2.467 --- php-src/NEWS:1.1760.2.466 Sun Aug 21 14:37:28 2005 +++ php-src/NEWSSun Aug 21 19:01:23 2005 @@ -1,8 +1,6 @@ PHPNEWS ||| 21 Aug 2005, PHP 5.0.5RC1 -- Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and - #33295. (Mike Bretz) - Upgraded PCRE library to version 5.0. (Andrei) - Removed php_check_syntax() function which never worked properly. (Ilia) - Added new function mysqli_set_charset(). (Georg) @@ -21,6 +19,8 @@ - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey) - Fixed memory corruption in stristr(). (Derick) - Fixed segfaults when CURL callback functions throw exception. (Tony) +- Fixed various reentrancy bugs in user-sort functions, solves bugs #33286 and + #33295. (Mike Bretz) - Fixed bug #34078 (Reflection API problems in methods with boolean or null default values). (Tony) - Fixed bug #34064 (arr[] as param to function is allowed only if function -- 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) / NEWS
tony2001Thu Aug 11 17:21:57 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.462r2=1.1760.2.463ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.462 php-src/NEWS:1.1760.2.463 --- php-src/NEWS:1.1760.2.462 Wed Aug 10 09:11:28 2005 +++ php-src/NEWSThu Aug 11 17:21:56 2005 @@ -19,6 +19,8 @@ - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey) - Fixed memory corruption in stristr(). (Derick) - Fixed segfaults when CURL callback functions throw exception. (Tony) +- Fixed bug #34078 (Reflection API problems in methods with boolean or + null default values). (Tony) - Fixed bug #34064 (arr[] as param to function is allowed only if function receives argument by reference). (Dmitry) - Fixed bug #34062 (Crash in catch block when many arguments are used). -- 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) / NEWS /ext/standard array.c /ext/standard/tests/array bug29253.phpt
dmitry Wed Aug 10 03:43:42 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/array bug29253.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #29253 (array_diff with $GLOBALS argument fails)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.458r2=1.1760.2.459ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.458 php-src/NEWS:1.1760.2.459
--- php-src/NEWS:1.1760.2.458 Sat Aug 6 13:09:40 2005
+++ php-src/NEWSWed Aug 10 03:43:39 2005
@@ -205,6 +205,7 @@
- Fixed bug #22836 (returning reference to uninitialized variable). (Dmitry)
- Fixed bug #29689 (default value of protected member overrides default value
of private)
and other private variable problems in inherited classes (Stas)
+- Fixed bug #29253 (array_diff with $GLOBALS argument fails). (Dmitry)
- Abstract private methods are no longer allowed (Stas)
31 Mar 2005, PHP 5.0.4
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.21r2=1.266.2.22ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.21
php-src/ext/standard/array.c:1.266.2.22
--- php-src/ext/standard/array.c:1.266.2.21 Thu Aug 4 06:35:36 2005
+++ php-src/ext/standard/array.cWed Aug 10 03:43:39 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.21 2005/08/04 10:35:36 dmitry Exp $ */
+/* $Id: array.c,v 1.266.2.22 2005/08/10 07:43:39 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -2984,6 +2984,15 @@
/* copy the argument array */
*return_value = **args[0];
zval_copy_ctor(return_value);
+ if (return_value-value.ht == EG(symbol_table)) {
+ HashTable *ht;
+ zval *tmp;
+
+ ALLOC_HASHTABLE(ht);
+ zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(ht, return_value-value.ht, (copy_ctor_func_t)
zval_add_ref, (void *) tmp, sizeof(zval *));
+ return_value-value.ht = ht;
+ }
if (behavior == INTERSECT_NORMAL data_compare_type ==
INTERSECT_COMP_DATA_USER) {
/* array_uintersect() */
@@ -3338,6 +3347,15 @@
/* copy the argument array */
*return_value = **args[0];
zval_copy_ctor(return_value);
+ if (return_value-value.ht == EG(symbol_table)) {
+ HashTable *ht;
+ zval *tmp;
+
+ ALLOC_HASHTABLE(ht);
+ zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0);
+ zend_hash_copy(ht, return_value-value.ht, (copy_ctor_func_t)
zval_add_ref, (void *) tmp, sizeof(zval *));
+ return_value-value.ht = ht;
+ }
if (behavior == DIFF_NORMAL data_compare_type ==
DIFF_COMP_DATA_USER) {
/* array_udiff() */
http://cvs.php.net/co.php/php-src/ext/standard/tests/array/bug29253.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/array/bug29253.phpt
+++ php-src/ext/standard/tests/array/bug29253.phpt
--
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) / NEWS /ext/standard array.c /ext/standard/tests/array bug33940.phpt
dmitry Wed Aug 10 04:23:54 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/array bug33940.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #33940 (array_map() fails to pass by reference when called
recursively)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.459r2=1.1760.2.460ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.459 php-src/NEWS:1.1760.2.460
--- php-src/NEWS:1.1760.2.459 Wed Aug 10 03:43:39 2005
+++ php-src/NEWSWed Aug 10 04:23:51 2005
@@ -20,6 +20,8 @@
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
- Fixed bug #33989 (extract($GLOBALS,EXTR_REFS) crashes PHP). (Dmitry)
+- Fixed bug #33940 (array_map() fails to pass by reference when called
+ recursively). (Dmitry)
- Fixed bug #33853 (php:function call __autoload with lowercase param).
(Marcus)
- Fixed bug #33802 (throw Exception in error handler causes crash). (Dmitry)
- Fixed bug #33723 (php_value overrides php_admin_value). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.22r2=1.266.2.23ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.22
php-src/ext/standard/array.c:1.266.2.23
--- php-src/ext/standard/array.c:1.266.2.22 Wed Aug 10 03:43:39 2005
+++ php-src/ext/standard/array.cWed Aug 10 04:23:52 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.22 2005/08/10 07:43:39 dmitry Exp $ */
+/* $Id: array.c,v 1.266.2.23 2005/08/10 08:23:52 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -4090,6 +4090,7 @@
efree(array_pos);
return;
}
+ SEPARATE_ZVAL_IF_NOT_REF(pargs[i]);
args[i] = *pargs[i];
array_len[i] = zend_hash_num_elements(Z_ARRVAL_PP(pargs[i]));
if (array_len[i] maxlen) {
http://cvs.php.net/co.php/php-src/ext/standard/tests/array/bug33940.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/array/bug33940.phpt
+++ php-src/ext/standard/tests/array/bug33940.phpt
--
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) / NEWS
andrey Sat Aug 6 13:09:46 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.457r2=1.1760.2.458ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.457 php-src/NEWS:1.1760.2.458 --- php-src/NEWS:1.1760.2.457 Thu Aug 4 06:35:36 2005 +++ php-src/NEWSSat Aug 6 13:09:40 2005 @@ -10,6 +10,8 @@ - Changed sha1_file() and md5_file() functions to use streams instead of low level IO. (Uwe) - Changed ming to support official 0.2a and 0.3 library versions. (Marcus) +- Fixed failing queries problem (FALSE returned) with mysqli_query() on 64 bit. + (Andrey) - Fixed memory corruption in pg_copy_from() in case the as_null parameter was passed. (Derick) - Fixed ext/mysqli to allocate less memory when fetching bound params -- 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) / NEWS /ext/standard array.c /ext/standard/tests/array bug33989.phpt
dmitry Thu Aug 4 06:35:37 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/array bug33989.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #33989 (extract($GLOBALS,EXTR_REFS) crashes PHP)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.456r2=1.1760.2.457ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.456 php-src/NEWS:1.1760.2.457
--- php-src/NEWS:1.1760.2.456 Mon Aug 1 04:12:38 2005
+++ php-src/NEWSThu Aug 4 06:35:36 2005
@@ -17,6 +17,7 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33989 (extract($GLOBALS,EXTR_REFS) crashes PHP). (Dmitry)
- Fixed bug #33853 (php:function call __autoload with lowercase param).
(Marcus)
- Fixed bug #33802 (throw Exception in error handler causes crash). (Dmitry)
- Fixed bug #33723 (php_value overrides php_admin_value). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.20r2=1.266.2.21ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.20
php-src/ext/standard/array.c:1.266.2.21
--- php-src/ext/standard/array.c:1.266.2.20 Mon Jul 4 06:08:21 2005
+++ php-src/ext/standard/array.cThu Aug 4 06:35:36 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.20 2005/07/04 10:08:21 dmitry Exp $ */
+/* $Id: array.c,v 1.266.2.21 2005/08/04 10:35:36 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -1393,11 +1393,11 @@
zval **orig_var;
if
(zend_hash_find(EG(active_symbol_table), final_name.c, final_name.len+1, (void
**) orig_var) == SUCCESS) {
- zval_ptr_dtor(orig_var);
-
SEPARATE_ZVAL_TO_MAKE_IS_REF(entry);
zval_add_ref(entry);
+ zval_ptr_dtor(orig_var);
+
*orig_var = *entry;
} else {
if ((*var_array)-refcount 1)
{
http://cvs.php.net/co.php/php-src/ext/standard/tests/array/bug33989.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/array/bug33989.phpt
+++ php-src/ext/standard/tests/array/bug33989.phpt
--TEST--
Bug #33989 (extract($GLOBALS,EXTR_REFS) crashes PHP)
--FILE--
?php
$a=a;
extract($GLOBALS, EXTR_REFS);
echo ok\n;
?
--EXPECT--
ok
--
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) / NEWS /sapi/apache mod_php5.c
dmitry Mon Aug 1 04:12:43 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/sapi/apachemod_php5.c
Log:
Fixed bug #33723 (php_value overrides php_admin_value)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.455r2=1.1760.2.456ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.455 php-src/NEWS:1.1760.2.456
--- php-src/NEWS:1.1760.2.455 Mon Jul 25 17:07:19 2005
+++ php-src/NEWSMon Aug 1 04:12:38 2005
@@ -19,6 +19,7 @@
- Fixed segfaults when CURL callback functions throw exception. (Tony)
- Fixed bug #33853 (php:function call __autoload with lowercase param).
(Marcus)
- Fixed bug #33802 (throw Exception in error handler causes crash). (Dmitry)
+- Fixed bug #33723 (php_value overrides php_admin_value). (Dmitry)
- Fixed bug #33710 (ArrayAccess objects doen't initialize $this). (Dmitry)
- Fixed bug #33588 (LDAP: RootDSE query not possible). (Jani)
- Fixed bug #33558 (warning with nested calls to functions returning by
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.10.2.3r2=1.10.2.4ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.10.2.3
php-src/sapi/apache/mod_php5.c:1.10.2.4
--- php-src/sapi/apache/mod_php5.c:1.10.2.3 Tue Jun 28 12:38:03 2005
+++ php-src/sapi/apache/mod_php5.c Mon Aug 1 04:12:42 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php5.c,v 1.10.2.3 2005/06/28 16:38:03 bfrance Exp $ */
+/* $Id: mod_php5.c,v 1.10.2.4 2005/08/01 08:12:42 dmitry Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -694,11 +694,11 @@
/* {{{ should_overwrite_per_dir_entry
*/
-static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_per_dir_entry *orig_per_dir_entry, zend_hash_key *hash_key, void *pData)
+static zend_bool should_overwrite_per_dir_entry(HashTable *target_ht,
php_per_dir_entry *new_per_dir_entry, zend_hash_key *hash_key, void *pData)
{
- php_per_dir_entry *new_per_dir_entry;
+ php_per_dir_entry *orig_per_dir_entry;
- if (zend_hash_find(target_ht, hash_key-arKey, hash_key-nKeyLength,
(void **) new_per_dir_entry)==FAILURE) {
+ if (zend_hash_find(target_ht, hash_key-arKey, hash_key-nKeyLength,
(void **) orig_per_dir_entry)==FAILURE) {
return 1; /* does not exist in dest, copy from source */
}
--
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) / NEWS
helly Mon Jul 25 17:07:20 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: _ BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.454r2=1.1760.2.455ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.454 php-src/NEWS:1.1760.2.455 --- php-src/NEWS:1.1760.2.454 Fri Jul 22 03:33:27 2005 +++ php-src/NEWSMon Jul 25 17:07:19 2005 @@ -9,6 +9,7 @@ - Added PHP_INT_MAX and PHP_INT_SIZE as predefined constants. (Andrey) - Changed sha1_file() and md5_file() functions to use streams instead of low level IO. (Uwe) +- Changed ming to support official 0.2a and 0.3 library versions. (Marcus) - Fixed memory corruption in pg_copy_from() in case the as_null parameter was passed. (Derick) - Fixed ext/mysqli to allocate less memory when fetching bound params @@ -16,6 +17,7 @@ - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey) - Fixed memory corruption in stristr(). (Derick) - Fixed segfaults when CURL callback functions throw exception. (Tony) +- Fixed bug #33853 (php:function call __autoload with lowercase param). (Marcus) - Fixed bug #33802 (throw Exception in error handler causes crash). (Dmitry) - Fixed bug #33710 (ArrayAccess objects doen't initialize $this). (Dmitry) - Fixed bug #33588 (LDAP: RootDSE query not possible). (Jani) -- 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) / NEWS /ext/ldap ldap.c
sniper Fri Jul 8 20:47:02 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/ldap ldap.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.449r2=1.1760.2.450ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.449 php-src/NEWS:1.1760.2.450
--- php-src/NEWS:1.1760.2.449 Tue Jul 5 08:47:05 2005
+++ php-src/NEWSFri Jul 8 20:47:00 2005
@@ -16,6 +16,7 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33588 (LDAP: RootDSE query not possible). (Jani)
- Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed).
(Dmitry)
- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
http://cvs.php.net/diff.php/php-src/ext/ldap/ldap.c?r1=1.154.2.5r2=1.154.2.6ty=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.154.2.5 php-src/ext/ldap/ldap.c:1.154.2.6
--- php-src/ext/ldap/ldap.c:1.154.2.5 Sun May 8 11:44:15 2005
+++ php-src/ext/ldap/ldap.c Fri Jul 8 20:47:01 2005
@@ -22,7 +22,7 @@
+--+
*/
-/* $Id: ldap.c,v 1.154.2.5 2005/05/08 15:44:15 sniper Exp $ */
+/* $Id: ldap.c,v 1.154.2.6 2005/07/09 00:47:01 sniper Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -314,7 +314,7 @@
php_info_print_table_start();
php_info_print_table_row(2, LDAP Support, enabled);
- php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.154.2.5
2005/05/08 15:44:15 sniper Exp $);
+ php_info_print_table_row(2, RCS Version, $Id: ldap.c,v 1.154.2.6
2005/07/09 00:47:01 sniper Exp $);
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, %ld/unlimited, LDAPG(num_links));
@@ -727,8 +727,12 @@
if (Z_TYPE_PP(link) != IS_ARRAY) {
convert_to_string_ex(filter);
ldap_filter = Z_STRVAL_PP(filter);
- convert_to_string_ex(base_dn);
- ldap_base_dn = Z_STRVAL_PP(base_dn);
+
+ /* If anything else than string is passed,
ldap_base_dn = NULL */
+ if (Z_TYPE_PP(base_dn) == IS_STRING) {
+ convert_to_string_ex(base_dn);
+ ldap_base_dn = Z_STRVAL_PP(base_dn);
+ }
}
break;
@@ -764,8 +768,13 @@
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(base_dn));
} else {
nbases = 0; /* this means string, not array */
- convert_to_string_ex(base_dn);
- ldap_base_dn = Z_STRLEN_PP(base_dn) 1 ? NULL :
Z_STRVAL_PP(base_dn);
+ /* If anything else than string is passed, ldap_base_dn
= NULL */
+ if (Z_TYPE_PP(base_dn) == IS_STRING) {
+ convert_to_string_ex(base_dn);
+ ldap_base_dn = Z_STRVAL_PP(base_dn);
+ } else {
+ ldap_base_dn = NULL;
+ }
}
if (Z_TYPE_PP(filter) == IS_ARRAY) {
@@ -803,8 +812,14 @@
if (nbases != 0) { /* base_dn an array? */
zend_hash_get_current_data(Z_ARRVAL_PP(base_dn), (void **)entry);
zend_hash_move_forward(Z_ARRVAL_PP(base_dn));
- convert_to_string_ex(entry);
- ldap_base_dn = Z_STRLEN_PP(entry) 1 ? NULL :
Z_STRVAL_PP(entry);
+
+ /* If anything else than string is passed,
ldap_base_dn = NULL */
+ if (Z_TYPE_PP(entry) == IS_STRING) {
+ convert_to_string_ex(entry);
+ ldap_base_dn = Z_STRVAL_PP(entry);
+ } else {
+ ldap_base_dn = NULL;
+ }
}
if (nfilters != 0) { /* filter an array? */
zend_hash_get_current_data(Z_ARRVAL_PP(filter),
(void **)entry);
@@ -845,11 +860,6 @@
return;
}
- /* fix to make null base_dn's work */
- if (strlen(ldap_base_dn) 1) {
- ldap_base_dn = NULL;
- }
-
ld = (ldap_linkdata *) zend_fetch_resource(link TSRMLS_CC, -1, ldap
link, NULL, 1, le_link);
if (ld == NULL) {
if (ldap_attrs != 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_0) / NEWS /ext/pgsql pgsql.c
derick Tue Jul 5 08:47:07 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/pgsql pgsql.c
Log:
- MFH: Fixed memory corruption in pg_copy_from() in case the as_null
parameter was
passed.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.448r2=1.1760.2.449ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.448 php-src/NEWS:1.1760.2.449
--- php-src/NEWS:1.1760.2.448 Mon Jul 4 08:47:26 2005
+++ php-src/NEWSTue Jul 5 08:47:05 2005
@@ -9,6 +9,8 @@
- Added PHP_INT_MAX and PHP_INT_SIZE as predefined constants. (Andrey)
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
+- Fixed memory corruption in pg_copy_from() in case the as_null parameter was
+ passed. (Derick)
- Fixed ext/mysqli to allocate less memory when fetching bound params
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
http://cvs.php.net/diff.php/php-src/ext/pgsql/pgsql.c?r1=1.311.2.4r2=1.311.2.5ty=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.311.2.4 php-src/ext/pgsql/pgsql.c:1.311.2.5
--- php-src/ext/pgsql/pgsql.c:1.311.2.4 Tue May 10 19:15:24 2005
+++ php-src/ext/pgsql/pgsql.c Tue Jul 5 08:47:06 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: pgsql.c,v 1.311.2.4 2005/05/10 23:15:24 tony2001 Exp $ */
+/* $Id: pgsql.c,v 1.311.2.5 2005/07/05 12:47:06 derick Exp $ */
#include stdlib.h
@@ -2750,6 +2750,7 @@
zval **tmp;
char *table_name, *pg_delim = NULL, *pg_null_as = NULL;
int table_name_len, pg_delim_len, pg_null_as_len;
+ int pg_null_as_free = 0;
char *query;
char *query_template = COPY \\ FROM STDIN DELIMITERS ':' WITH NULL
AS '';
HashPosition pos;
@@ -2769,6 +2770,7 @@
}
if (!pg_null_as) {
pg_null_as = safe_estrdup(N);
+ pg_null_as_free = 1;
}
ZEND_FETCH_RESOURCE2(pgsql, PGconn *, pgsql_link, id, PostgreSQL
link, le_link, le_plink);
@@ -2781,7 +2783,9 @@
}
pgsql_result = PQexec(pgsql, query);
- efree(pg_null_as);
+ if (pg_null_as_free) {
+ efree(pg_null_as);
+ }
efree(query);
if (pgsql_result) {
--
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) / NEWS /ext/standard array.c /ext/standard/tests/array bug31158.phpt
dmitry Mon Jul 4 06:08:22 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/standard/tests/array bug31158.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #31158 (array_splice on $GLOBALS crashes)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.446r2=1.1760.2.447ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.446 php-src/NEWS:1.1760.2.447
--- php-src/NEWS:1.1760.2.446 Tue Jun 28 13:07:26 2005
+++ php-src/NEWSMon Jul 4 06:08:19 2005
@@ -136,6 +136,7 @@
- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia)
- Fixed bug #31363 (broken non-blocking flock()). ian at snork dot net
- Fixed bug #31213 (Sideeffects caused by fix of bug #29493). (Dmitry)
+- Fixed bug #31158 (array_splice on $GLOBALS crashes). (Dmitry)
- Fixed bug #30961 (Wrong linenumber in ReflectionClass getStartLine()).
(Dmitry)
- Fixed bug #30889 (Conflict between __get/__set and ++ operator). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.19r2=1.266.2.20ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.19
php-src/ext/standard/array.c:1.266.2.20
--- php-src/ext/standard/array.c:1.266.2.19 Tue Jun 21 08:10:59 2005
+++ php-src/ext/standard/array.cMon Jul 4 06:08:21 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.19 2005/06/21 12:10:59 dmitry Exp $ */
+/* $Id: array.c,v 1.266.2.20 2005/07/04 10:08:21 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -2009,8 +2009,8 @@
hashtable and replace it with new one */
new_hash = php_splice(Z_ARRVAL_P(stack), 0, 0, args[1], argc-1, NULL);
zend_hash_destroy(Z_ARRVAL_P(stack));
- efree(Z_ARRVAL_P(stack));
- Z_ARRVAL_P(stack) = new_hash;
+ *Z_ARRVAL_P(stack) = *new_hash;
+ FREE_HASHTABLE(new_hash);
/* Clean up and return the number of elements in the stack */
efree(args);
@@ -2086,8 +2086,8 @@
/* Replace input array's hashtable with the new one */
zend_hash_destroy(Z_ARRVAL_P(array));
- efree(Z_ARRVAL_P(array));
- Z_ARRVAL_P(array) = new_hash;
+ *Z_ARRVAL_P(array) = *new_hash;
+ FREE_HASHTABLE(new_hash);
/* Clean up */
if (argc == 4)
@@ -2620,8 +2620,8 @@
/* Copy the result hash into return value */
zend_hash_destroy(Z_ARRVAL_P(return_value));
- efree(Z_ARRVAL_P(return_value));
- Z_ARRVAL_P(return_value) = new_hash;
+ *Z_ARRVAL_P(return_value) = *new_hash;
+ FREE_HASHTABLE(new_hash);
/* Clean up */
efree(pads);
http://cvs.php.net/co.php/php-src/ext/standard/tests/array/bug31158.phpt?r=1.1p=1
Index: php-src/ext/standard/tests/array/bug31158.phpt
+++ php-src/ext/standard/tests/array/bug31158.phpt
--TEST--
Bug #31158 (array_splice on $GLOBALS crashes)
--FILE--
?php
function __(){
$GLOBALS['a'] = bug\n;
array_splice($GLOBALS,0,count($GLOBALS));
/* All global variables including $GLOBALS are removed */
echo $GLOBALS['a'];
}
__();
echo ok\n;
?
--EXPECTF--
Notice: Undefined variable: GLOBALS in %sbug31158.php on line 6
ok
--
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) / NEWS /sapi/aolserver aolserver.c /sapi/apache2filter apache_config.c /sapi/apache2handler apache_config.c /sapi/nsapi nsapi.c
dmitry Mon Jul 4 08:47:27 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/sapi/aolserver aolserver.c
/php-src/sapi/apache2filter apache_config.c
/php-src/sapi/apache2handlerapache_config.c
/php-src/sapi/nsapi nsapi.c
Log:
Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.447r2=1.1760.2.448ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.447 php-src/NEWS:1.1760.2.448
--- php-src/NEWS:1.1760.2.447 Mon Jul 4 06:08:19 2005
+++ php-src/NEWSMon Jul 4 08:47:26 2005
@@ -14,6 +14,8 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33520 (crash if safe_mode is on and session.save_path is changed).
+ (Dmitry)
- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob)
- Fixed bug #33277 (private method accessed by child class). (Dmitry)
http://cvs.php.net/diff.php/php-src/sapi/aolserver/aolserver.c?r1=1.77r2=1.77.2.1ty=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.77
php-src/sapi/aolserver/aolserver.c:1.77.2.1
--- php-src/sapi/aolserver/aolserver.c:1.77 Thu Jan 8 03:18:02 2004
+++ php-src/sapi/aolserver/aolserver.c Mon Jul 4 08:47:26 2005
@@ -22,7 +22,7 @@
* - CGI/1.1 conformance
*/
-/* $Id: aolserver.c,v 1.77 2004/01/08 08:18:02 andi Exp $ */
+/* $Id: aolserver.c,v 1.77.2.1 2005/07/04 12:47:26 dmitry Exp $ */
/* conflict between PHP and AOLserver headers */
#define Debug php_Debug
@@ -205,7 +205,7 @@
int i;
php_info_print_table_start();
- php_info_print_table_row(2, SAPI module version, $Id: aolserver.c,v
1.77 2004/01/08 08:18:02 andi Exp $);
+ php_info_print_table_row(2, SAPI module version, $Id: aolserver.c,v
1.77.2.1 2005/07/04 12:47:26 dmitry Exp $);
php_info_print_table_row(2, Build date, Ns_InfoBuildDate());
php_info_print_table_row(2, Config file path, Ns_InfoConfigFile());
php_info_print_table_row(2, Error Log path, Ns_InfoErrorLog());
@@ -549,7 +549,7 @@
Ns_Log(Debug, PHP configuration option
'%s=%s', new_key, val);
zend_alter_ini_entry(new_key, strlen(new_key) +
1, val,
- strlen(val) + 1,
PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+ strlen(val) + 1,
PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
efree(new_key);
}
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/apache_config.c?r1=1.32r2=1.32.2.1ty=u
Index: php-src/sapi/apache2filter/apache_config.c
diff -u php-src/sapi/apache2filter/apache_config.c:1.32
php-src/sapi/apache2filter/apache_config.c:1.32.2.1
--- php-src/sapi/apache2filter/apache_config.c:1.32 Thu Jan 8 03:18:04 2004
+++ php-src/sapi/apache2filter/apache_config.c Mon Jul 4 08:47:26 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.32 2004/01/08 08:18:04 andi Exp $ */
+/* $Id: apache_config.c,v 1.32.2.1 2005/07/04 12:47:26 dmitry Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -178,7 +178,7 @@
zend_hash_get_current_data(d-config, (void **) data);
phpapdebug((stderr, APPLYING (%s)(%s)\n, str, data-value));
if (zend_alter_ini_entry(str, str_len, data-value,
data-value_len,
- data-status, PHP_INI_STAGE_RUNTIME) ==
FAILURE) {
+ data-status, PHP_INI_STAGE_ACTIVATE)
== FAILURE) {
phpapdebug((stderr, ..FAILED\n));
}
}
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/apache_config.c?r1=1.5r2=1.5.2.1ty=u
Index: php-src/sapi/apache2handler/apache_config.c
diff -u php-src/sapi/apache2handler/apache_config.c:1.5
php-src/sapi/apache2handler/apache_config.c:1.5.2.1
--- php-src/sapi/apache2handler/apache_config.c:1.5 Thu Jan 8 03:18:05 2004
+++ php-src/sapi/apache2handler/apache_config.c Mon Jul 4 08:47:26 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: apache_config.c,v 1.5 2004/01/08 08:18:05 andi Exp $ */
+/* $Id: apache_config.c,v 1.5.2.1 2005/07/04 12:47:26 dmitry Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -166,7 +166,7 @@
zend_hash_move_forward(d-config)) {
zend_hash_get_current_data(d-config, (void **) data);
phpapdebug((stderr, APPLYING (%s)(%s)\n, str,
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /sapi/apache mod_php5.c
bfrance Tue Jun 28 12:38:03 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/sapi/apachemod_php5.c
Log:
MFH:
Added a SG(server_context) NULL check to php_apache_getenv.
This can get called when key = ${key}:/foo is used in a .ini file, but
key has not be set yet.
You will end up with a value of :/foo, but at least it will not crash.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.444r2=1.1760.2.445ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.444 php-src/NEWS:1.1760.2.445
--- php-src/NEWS:1.1760.2.444 Mon Jun 27 14:21:57 2005
+++ php-src/NEWSTue Jun 28 12:38:03 2005
@@ -3,6 +3,7 @@
?? ??? 2005, PHP 5.0.5
- Upgraded PCRE library to version 5.0. (Andrei)
- Removed php_check_syntax() function which never worked properly. (Ilia)
+- Added a SG(server_context) NULL check to php_apache_getenv. (Brian)
- Added new function mysqli_set_charset(). (Georg)
- Added man pages for phpize and php-config scripts. (Jakub Vrana)
- Added support for .cc files in extensions. (Brian)
http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.10.2.2r2=1.10.2.3ty=u
Index: php-src/sapi/apache/mod_php5.c
diff -u php-src/sapi/apache/mod_php5.c:1.10.2.2
php-src/sapi/apache/mod_php5.c:1.10.2.3
--- php-src/sapi/apache/mod_php5.c:1.10.2.2 Mon Jun 20 08:46:52 2005
+++ php-src/sapi/apache/mod_php5.c Tue Jun 28 12:38:03 2005
@@ -17,7 +17,7 @@
| PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] |
+--+
*/
-/* $Id: mod_php5.c,v 1.10.2.2 2005/06/20 12:46:52 tony2001 Exp $ */
+/* $Id: mod_php5.c,v 1.10.2.3 2005/06/28 16:38:03 bfrance Exp $ */
#include php_apache_http.h
#include http_conf_globals.h
@@ -352,6 +352,10 @@
*/
static char *php_apache_getenv(char *name, size_t name_len TSRMLS_DC)
{
+ if (SG(server_context) == NULL) {
+ return NULL;
+ }
+
return (char *) table_get(((request_rec *)
SG(server_context))-subprocess_env, name);
}
/* }}} */
--
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) / NEWS
sniper Tue Jun 28 13:07:27 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: Removed unnecessary entry http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.445r2=1.1760.2.446ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.445 php-src/NEWS:1.1760.2.446 --- php-src/NEWS:1.1760.2.445 Tue Jun 28 12:38:03 2005 +++ php-src/NEWSTue Jun 28 13:07:26 2005 @@ -3,7 +3,6 @@ ?? ??? 2005, PHP 5.0.5 - Upgraded PCRE library to version 5.0. (Andrei) - Removed php_check_syntax() function which never worked properly. (Ilia) -- Added a SG(server_context) NULL check to php_apache_getenv. (Brian) - Added new function mysqli_set_charset(). (Georg) - Added man pages for phpize and php-config scripts. (Jakub Vrana) - Added support for .cc files in extensions. (Brian) -- 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) / NEWS /ext/mysqli mysqli.c
tony2001Mon Jun 27 14:22:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mysqli mysqli.c
Log:
MFH: fix #33491 (crash after extending MySQLi internal class)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.443r2=1.1760.2.444ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.443 php-src/NEWS:1.1760.2.444
--- php-src/NEWS:1.1760.2.443 Fri Jun 24 04:45:41 2005
+++ php-src/NEWSMon Jun 27 14:21:57 2005
@@ -14,6 +14,7 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33491 (crash after extending MySQLi internal class). (Tony)
- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob)
- Fixed bug #33277 (private method accessed by child class). (Dmitry)
- Fixed bug #33268 (iconv_strlen() works only with a parameter of 3 in
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli.c?r1=1.43.2.16r2=1.43.2.17ty=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.43.2.16
php-src/ext/mysqli/mysqli.c:1.43.2.17
--- php-src/ext/mysqli/mysqli.c:1.43.2.16 Thu May 5 09:30:31 2005
+++ php-src/ext/mysqli/mysqli.c Mon Jun 27 14:22:00 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli.c,v 1.43.2.16 2005/05/05 13:30:31 georg Exp $
+ $Id: mysqli.c,v 1.43.2.17 2005/06/27 18:22:00 tony2001 Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -120,17 +120,28 @@
static void mysqli_objects_free_storage(zend_object *object TSRMLS_DC)
{
mysqli_object *intern = (mysqli_object *)object;
+
+ zend_objects_free_object_storage((intern-zo) TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ mysqli_objects_destroy_object
+ */
+static void mysqli_objects_destroy_object(void *object, zend_object_handle
handle TSRMLS_DC)
+{
+ mysqli_object *intern = (mysqli_object *)object;
MYSQLI_RESOURCE *my_res = (MYSQLI_RESOURCE *)intern-ptr;
- zend_hash_destroy(intern-zo.properties);
- FREE_HASHTABLE(intern-zo.properties);
+ zend_objects_destroy_object(object, handle TSRMLS_CC);
/* link object */
if (instanceof_function(intern-zo.ce, mysqli_link_class_entry
TSRMLS_CC)) {
if (my_res my_res-ptr) {
MY_MYSQL *mysql = (MY_MYSQL *)my_res-ptr;
-
- mysql_close(mysql-mysql);
+
+ if (mysql-mysql) {
+ mysql_close(mysql-mysql);
+ }
php_clear_mysql(mysql);
efree(mysql);
@@ -146,8 +157,8 @@
mysql_free_result(my_res-ptr);
}
}
+ intern-ptr = NULL;
my_efree(my_res);
- efree(object);
}
/* }}} */
@@ -331,7 +342,7 @@
zend_hash_copy(intern-zo.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref,
(void *) tmp, sizeof(zval *));
- retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t) zend_objects_destroy_object,
(zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL
TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern,
(zend_objects_store_dtor_t) mysqli_objects_destroy_object,
(zend_objects_free_object_storage_t) mysqli_objects_free_storage, NULL
TSRMLS_CC);
retval.handlers = mysqli_object_handlers;
return retval;
--
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) / NEWS
dmitry Wed Jun 22 04:31:20 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: Fixed bug #33257 (array_splice() inconsistent when passed function instead of variable) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.437r2=1.1760.2.438ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.437 php-src/NEWS:1.1760.2.438 --- php-src/NEWS:1.1760.2.437 Tue Jun 21 08:10:59 2005 +++ php-src/NEWSWed Jun 22 04:31:19 2005 @@ -19,6 +19,8 @@ - Fixed bug #33268 (iconv_strlen() works only with a parameter of 3 in length). (Ilia) - Fixed bug #33263 (mysqli_real_escape doesn't work in __construct) (Georg) +- Fixed bug #33257 (array_splice() inconsistent when passed function instead + of variable). (Dmitry) - Fixed bug #33243 (ze1_compatibility_mode does not work as expected). (Dmitry) - Fixed bug #33242 (Mangled error message when stream fails). (Derick) - Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony) -- 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) / NEWS /ext/standard array.c
dmitry Tue Jun 21 08:11:00 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fixed bug #31213 (Sideeffects caused by fix of bug #29493)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.436r2=1.1760.2.437ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.436 php-src/NEWS:1.1760.2.437
--- php-src/NEWS:1.1760.2.436 Mon Jun 20 08:46:51 2005
+++ php-src/NEWSTue Jun 21 08:10:59 2005
@@ -130,6 +130,7 @@
serializer). (Dmitry)
- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia)
- Fixed bug #31363 (broken non-blocking flock()). ian at snork dot net
+- Fixed bug #31213 (Sideeffects caused by fix of bug #29493). (Dmitry)
- Fixed bug #30961 (Wrong linenumber in ReflectionClass getStartLine()).
(Dmitry)
- Fixed bug #30889 (Conflict between __get/__set and ++ operator). (Dmitry)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.18r2=1.266.2.19ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.18
php-src/ext/standard/array.c:1.266.2.19
--- php-src/ext/standard/array.c:1.266.2.18 Wed Jun 8 15:54:46 2005
+++ php-src/ext/standard/array.cTue Jun 21 08:10:59 2005
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.266.2.18 2005/06/08 19:54:46 dmitry Exp $ */
+/* $Id: array.c,v 1.266.2.19 2005/06/21 12:10:59 dmitry Exp $ */
#include php.h
#include php_ini.h
@@ -1400,7 +1400,11 @@
*orig_var = *entry;
} else {
- (*entry)-is_ref = 1;
+ if ((*var_array)-refcount 1)
{
+
SEPARATE_ZVAL_TO_MAKE_IS_REF(entry);
+ } else {
+ (*entry)-is_ref = 1;
+ }
zval_add_ref(entry);
zend_hash_update(EG(active_symbol_table), final_name.c, final_name.len+1, (void
**) entry, sizeof(zval *), 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_0) / NEWS /sapi/apache mod_php5.c /sapi/apache2filter sapi_apache2.c /sapi/apache2handler sapi_apache2.c /sapi/apache_hooks mod_php5.c
tony2001Mon Jun 20 08:46:52 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/sapi/apachemod_php5.c /php-src/sapi/apache2filter sapi_apache2.c /php-src/sapi/apache2handlersapi_apache2.c /php-src/sapi/apache_hooks mod_php5.c Log: MFH: fix #29683 (headers_list() returns empty array) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.435r2=1.1760.2.436ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.435 php-src/NEWS:1.1760.2.436 --- php-src/NEWS:1.1760.2.435 Fri Jun 17 12:37:07 2005 +++ php-src/NEWSMon Jun 20 08:46:51 2005 @@ -156,6 +156,7 @@ handler). (Tony) - Fixed bug #29971 (variables_order behaviour). (Dmitry) - Fixed bug #29944 (Function defined in switch, crashes). (Dmitry) +- Fixed bug #29683 (headers_list() returns empty array). (Tony) - Fixed bug #29583 (crash when echoing a COM object). (M.Sisolak, Wez) - Fixed bug #29338 (unencoded spaces get ignored after certain tags). (Ilia) - Fixed bug #29210 (Function: is_callable - no support for private and http://cvs.php.net/diff.php/php-src/sapi/apache/mod_php5.c?r1=1.10.2.1r2=1.10.2.2ty=u Index: php-src/sapi/apache/mod_php5.c diff -u php-src/sapi/apache/mod_php5.c:1.10.2.1 php-src/sapi/apache/mod_php5.c:1.10.2.2 --- php-src/sapi/apache/mod_php5.c:1.10.2.1 Thu May 19 12:06:38 2005 +++ php-src/sapi/apache/mod_php5.c Mon Jun 20 08:46:52 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: mod_php5.c,v 1.10.2.1 2005/05/19 16:06:38 rasmus Exp $ */ +/* $Id: mod_php5.c,v 1.10.2.2 2005/06/20 12:46:52 tony2001 Exp $ */ #include php_apache_http.h #include http_conf_globals.h @@ -199,9 +199,7 @@ *p = ':'; /* a well behaved header handler shouldn't change its original arguments */ - efree(sapi_header-header); - - return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */ + return SAPI_HEADER_ADD; } /* }}} */ http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.125.2.3r2=1.125.2.4ty=u Index: php-src/sapi/apache2filter/sapi_apache2.c diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.3 php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.4 --- php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.3 Mon Apr 11 11:39:21 2005 +++ php-src/sapi/apache2filter/sapi_apache2.c Mon Jun 20 08:46:52 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.125.2.3 2005/04/11 15:39:21 sniper Exp $ */ +/* $Id: sapi_apache2.c,v 1.125.2.4 2005/06/20 12:46:52 tony2001 Exp $ */ #include fcntl.h @@ -128,9 +128,7 @@ else apr_table_add(ctx-r-headers_out, sapi_header-header, val); - sapi_free_header(sapi_header); - - return 0; + return SAPI_HEADER_ADD; } static int http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.8r2=1.40.2.9ty=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.8 php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.9 --- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.8 Fri Apr 8 16:34:03 2005 +++ php-src/sapi/apache2handler/sapi_apache2.c Mon Jun 20 08:46:52 2005 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: sapi_apache2.c,v 1.40.2.8 2005/04/08 20:34:03 sniper Exp $ */ +/* $Id: sapi_apache2.c,v 1.40.2.9 2005/06/20 12:46:52 tony2001 Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -112,9 +112,7 @@ apr_table_add(ctx-r-headers_out, sapi_header-header, val); } - sapi_free_header(sapi_header); - - return 0; + return SAPI_HEADER_ADD; } static int http://cvs.php.net/diff.php/php-src/sapi/apache_hooks/mod_php5.c?r1=1.4.2.1r2=1.4.2.2ty=u Index: php-src/sapi/apache_hooks/mod_php5.c diff -u php-src/sapi/apache_hooks/mod_php5.c:1.4.2.1 php-src/sapi/apache_hooks/mod_php5.c:1.4.2.2 --- php-src/sapi/apache_hooks/mod_php5.c:1.4.2.1Fri Apr 22 05:14:29 2005 +++ php-src/sapi/apache_hooks/mod_php5.cMon Jun 20 08:46:52 2005 @@ -17,7 +17,7 @@ | PHP 4.0 patches by Zeev Suraski [EMAIL PROTECTED] | +--+ */ -/* $Id: mod_php5.c,v 1.4.2.1 2005/04/22 09:14:29 tony2001 Exp $ */ +/* $Id: mod_php5.c,v 1.4.2.2 2005/06/20 12:46:52 tony2001 Exp $ */ #include php_apache_http.h @@ -340,9 +340,7 @@ *p = ':'; /* a well behaved header handler shouldn't change its original arguments */ - efree(sapi_header-header); - - return 0; /* don't use the default SAPI mechanism, Apache duplicates this functionality */
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/mysqli mysqli_api.c /ext/mysqli/tests bug33263.phpt
georg Fri Jun 17 12:37:08 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/mysqli/tests bug33263.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mysqli mysqli_api.c
Log:
MFH: fix for bug #33263
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.434r2=1.1760.2.435ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.434 php-src/NEWS:1.1760.2.435
--- php-src/NEWS:1.1760.2.434 Fri Jun 17 06:51:09 2005
+++ php-src/NEWSFri Jun 17 12:37:07 2005
@@ -18,6 +18,7 @@
- Fixed bug #33277 (private method accessed by child class). (Dmitry)
- Fixed bug #33268 (iconv_strlen() works only with a parameter of 3 in
length). (Ilia)
+- Fixed bug #33263 (mysqli_real_escape doesn't work in __construct) (Georg)
- Fixed bug #33243 (ze1_compatibility_mode does not work as expected). (Dmitry)
- Fixed bug #33242 (Mangled error message when stream fails). (Derick)
- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.21r2=1.87.2.22ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.21
php-src/ext/mysqli/mysqli_api.c:1.87.2.22
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.21 Wed Jun 15 10:04:23 2005
+++ php-src/ext/mysqli/mysqli_api.c Fri Jun 17 12:37:07 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.87.2.21 2005/06/15 14:04:23 georg Exp $
+ $Id: mysqli_api.c,v 1.87.2.22 2005/06/17 16:37:07 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1032,7 +1032,13 @@
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1,
sizeof(MYSQLI_RESOURCE));
mysqli_resource-ptr = (void *)mysql;
- MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry);
+
+ if (!getThis()) {
+ MYSQLI_RETURN_RESOURCE(mysqli_resource,
mysqli_link_class_entry);
+ } else {
+ ((mysqli_object *) zend_object_store_get_object(getThis()
TSRMLS_CC))-ptr = mysqli_resource;
+ ((mysqli_object *) zend_object_store_get_object(getThis()
TSRMLS_CC))-valid = 1;
+ }
}
/* }}} */
http://cvs.php.net/co.php/php-src/ext/mysqli/tests/bug33263.phpt?r=1.1p=1
Index: php-src/ext/mysqli/tests/bug33263.phpt
+++ php-src/ext/mysqli/tests/bug33263.phpt
--TEST--
bug #33263 (mysqli_real_connect in __construct)
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
include connect.inc;
class test extends mysqli
{
public function __construct($host, $user, $passwd, $db) {
parent::init();
parent::real_connect($host, $user, $passwd, $db);
}
}
$mysql = new test($host, $user, $passwd, test);
$stmt = $mysql-prepare(SELECT DATABASE());
$stmt-execute();
$stmt-bind_result($db);
$stmt-fetch();
$stmt-close();
var_dump($db);
$mysql-close();
?
--EXPECT--
string(4) test
--
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) / NEWS
rrichards Tue Jun 14 15:41:20 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.432r2=1.1760.2.433ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.432 php-src/NEWS:1.1760.2.433 --- php-src/NEWS:1.1760.2.432 Thu Jun 9 13:13:36 2005 +++ php-src/NEWSTue Jun 14 15:41:16 2005 @@ -14,6 +14,7 @@ - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey) - Fixed memory corruption in stristr(). (Derick) - Fixed segfaults when CURL callback functions throw exception. (Tony) +- Fixed bug #33340 (CLI Crash when calling php:function from XSLT). (Rob) - Fixed bug #33268 (iconv_strlen() works only with a parameter of 3 in length). (Ilia) - Fixed bug #33243 (ze1_compatibility_mode does not work as expected). (Dmitry) -- 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) / NEWS
stasThu Jun 9 13:03:05 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: #29689 http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.430r2=1.1760.2.431ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.430 php-src/NEWS:1.1760.2.431 --- php-src/NEWS:1.1760.2.430 Thu Jun 9 06:13:57 2005 +++ php-src/NEWSThu Jun 9 13:03:03 2005 @@ -170,6 +170,8 @@ - Fixed bug #25922 (In error handler, modifying 5th arg (errcontext) may result in seg fault). (Dmitry) - Fixed bug #22836 (returning reference to uninitialized variable). (Dmitry) +- Fixed bug #29689 (default value of protected member overrides default value of private) + and other private variable problems in inherited classes (Stas) 31 Mar 2005, PHP 5.0.4 - Added SNMPv2 support. (harrie) -- 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) / NEWS
stasThu Jun 9 13:13:36 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: RIP abstrace private http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.431r2=1.1760.2.432ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.431 php-src/NEWS:1.1760.2.432 --- php-src/NEWS:1.1760.2.431 Thu Jun 9 13:03:03 2005 +++ php-src/NEWSThu Jun 9 13:13:36 2005 @@ -172,6 +172,7 @@ - Fixed bug #22836 (returning reference to uninitialized variable). (Dmitry) - Fixed bug #29689 (default value of protected member overrides default value of private) and other private variable problems in inherited classes (Stas) +- Abstract private methods are no longer allowed (Stas) 31 Mar 2005, PHP 5.0.4 - Added SNMPv2 support. (harrie) -- 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) / NEWS /ext/iconv iconv.c
iliaa Wed Jun 8 19:51:06 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/iconv iconv.c
Log:
MFH: Fixed bug #33268 (iconv_strlen() works only with a parameter of 3
in length).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.428r2=1.1760.2.429ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.428 php-src/NEWS:1.1760.2.429
--- php-src/NEWS:1.1760.2.428 Wed Jun 8 09:20:57 2005
+++ php-src/NEWSWed Jun 8 19:51:05 2005
@@ -14,6 +14,8 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33268 (iconv_strlen() works only with a parameter of 3 in
+ length). (Ilia)
- Fixed bug #33243 (ze1_compatibility_mode does not work as expected). (Dmitry)
- Fixed bug #33242 (Mangled error message when stream fails). (Derick)
- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
http://cvs.php.net/diff.php/php-src/ext/iconv/iconv.c?r1=1.117.2.5r2=1.117.2.6ty=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.117.2.5 php-src/ext/iconv/iconv.c:1.117.2.6
--- php-src/ext/iconv/iconv.c:1.117.2.5 Wed Mar 23 18:08:24 2005
+++ php-src/ext/iconv/iconv.c Wed Jun 8 19:51:05 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: iconv.c,v 1.117.2.5 2005/03/23 23:08:24 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.117.2.6 2005/06/08 23:51:05 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -516,7 +516,7 @@
#endif
}
- out_left = 0;
+ errno = out_left = 0;
for (in_p = str, in_left = nbytes, cnt = 0; in_left 0; cnt+=2) {
size_t prev_in_left;
@@ -547,6 +547,7 @@
break;
case E2BIG:
+ case 0:
*pretval = cnt;
break;
--
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) / NEWS /ext/standard http_fopen_wrapper.c
derick Mon Jun 6 08:41:29 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard http_fopen_wrapper.c
/php-srcNEWS
Log:
- Fixed bug #33242 (Mangled error message when stream fails).
http://cvs.php.net/diff.php/php-src/ext/standard/http_fopen_wrapper.c?r1=1.88.2.3r2=1.88.2.4ty=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.88.2.3
php-src/ext/standard/http_fopen_wrapper.c:1.88.2.4
--- php-src/ext/standard/http_fopen_wrapper.c:1.88.2.3 Thu May 5 22:19:36 2005
+++ php-src/ext/standard/http_fopen_wrapper.c Mon Jun 6 08:41:28 2005
@@ -18,7 +18,7 @@
| Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: http_fopen_wrapper.c,v 1.88.2.3 2005/05/06 02:19:36 iliaa Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.88.2.4 2005/06/06 12:41:28 derick Exp $ */
#include php.h
#include php_globals.h
@@ -101,6 +101,8 @@
char *transport_string, *errstr = NULL;
int transport_len, have_header = 0, request_fulluri = 0;
+ tmp_line[0] = '\0';
+
if (redirect_max 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Circular redirect,
aborting.);
return NULL;
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.422r2=1.1760.2.423ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.422 php-src/NEWS:1.1760.2.423
--- php-src/NEWS:1.1760.2.422 Mon Jun 6 06:38:21 2005
+++ php-src/NEWSMon Jun 6 08:41:28 2005
@@ -14,6 +14,7 @@
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33242 (Mangled error message when stream fails). (Derick)
- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches). (rich at kastle dot com, Tony)
--
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) / NEWS /ext/bz2 bz2.c
iliaa Sun Jun 5 14:05:08 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/bz2bz2.c
/php-srcNEWS
Log:
MFH: Fixed bug #33070 (Improved performance of bzdecompress() by several
orders of magnitude).
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.6.2.2r2=1.6.2.3ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.6.2.2 php-src/ext/bz2/bz2.c:1.6.2.3
--- php-src/ext/bz2/bz2.c:1.6.2.2 Sat Mar 19 08:56:31 2005
+++ php-src/ext/bz2/bz2.c Sun Jun 5 14:05:07 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2.c,v 1.6.2.2 2005/03/19 13:56:31 tony2001 Exp $ */
+/* $Id: bz2.c,v 1.6.2.3 2005/06/05 18:05:07 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -40,9 +40,6 @@
#define PHP_BZ_ERRSTR 1
#define PHP_BZ_ERRBOTH 2
-/* Blocksize of the decompression buffer */
-#define PHP_BZ_DECOMPRESS_SIZE 4096
-
function_entry bz2_functions[] = {
PHP_FE(bzopen, NULL)
PHP_FE(bzread, NULL)
@@ -438,56 +435,49 @@
Decompresses BZip2 compressed data */
PHP_FUNCTION(bzdecompress)
{
- zval**source, /* Source data to
decompress */
- **zsmall; /* (Optional) user
specified small */
- char *dest; /* Destination buffer,
initially allocated */
- int error, /* Error container */
- iter = 1, /* Iteration count for
the compression loop */
- size, /* Current size
to realloc the dest buffer to */
- dest_len = PHP_BZ_DECOMPRESS_SIZE, /* Size of the
destination length */
- small= 0, /* The actual
small */
- argc = ZEND_NUM_ARGS(); /* Argument count
*/
-
- if (argc 1 || argc 2 || zend_get_parameters_ex(argc, source,
zsmall) == FAILURE) {
- WRONG_PARAM_COUNT;
+ char *source, *dest;
+ int source_len, error;
+ long small = 0;
+ unsigned int size = 0;
+ bz_stream bzs;
+
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|l,
source, source_len, small)) {
+ RETURN_FALSE;
}
- convert_to_string_ex(source);
-
- /* optional small argument handling */
- if (argc 1) {
- convert_to_long_ex(zsmall);
- small = Z_LVAL_PP(zsmall);
+ bzs.bzalloc = NULL;
+ bzs.bzfree = NULL;
+
+ if (BZ2_bzDecompressInit(bzs, 0, small) != BZ_OK) {
+ RETURN_FALSE;
}
- /* Depending on the size of the source buffer, either allocate
- the length of the source buffer or the a default decompression
- size */
- dest = emalloc(PHP_BZ_DECOMPRESS_SIZE Z_STRLEN_PP(source) ?
PHP_BZ_DECOMPRESS_SIZE : Z_STRLEN_PP(source));
-
- /* (de)Compression Loop */
- do {
- /* Handle the (re)allocation of the buffer */
- size = dest_len * iter;
- if (iter 1) {
- dest = erealloc(dest, size);
- }
- ++iter;
+ bzs.next_in = source;
+ bzs.avail_in = source_len;
- /* Perform the decompression */
- error = BZ2_bzBuffToBuffDecompress(dest, size,
Z_STRVAL_PP(source), Z_STRLEN_PP(source), small, 0);
- } while (error == BZ_OUTBUFF_FULL);
-
- if (error != BZ_OK) {
- efree(dest);
- RETURN_LONG(error);
- } else {
- /* we might have allocated a little to much, so erealloc the
buffer
-down to size, before returning it */
+ /* in most cases bz2 offers at least 2:1 compression, so we use that as
our base */
+ bzs.avail_out = source_len * 2;
+ bzs.next_out = dest = emalloc(bzs.avail_out + 1);
+
+ while ((error = BZ2_bzDecompress(bzs)) == BZ_OK bzs.avail_in 0) {
+ /* compression is better then 2:1, need to allocate more memory
*/
+ bzs.avail_out = source_len;
+ size = (bzs.total_out_hi32 32) + bzs.total_out_lo32;
+ dest = erealloc(dest, size + bzs.avail_out + 1);
+ bzs.next_out = dest + size;
+ }
+
+ if (error == BZ_STREAM_END || error == BZ_OK) {
+ size = (bzs.total_out_hi32 32) + bzs.total_out_lo32;
dest = erealloc(dest, size + 1);
- dest[size] = 0;
- RETURN_STRINGL(dest, size, 0);
+ dest[size] = '\0';
+ RETVAL_STRINGL(dest, size, 0);
+ } else { /* real error */
+ efree(dest);
+ RETVAL_LONG(error);
}
+
+ BZ2_bzDecompressEnd(bzs);
}
/* }}}
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/standard string.c
derick Thu Jun 2 04:31:08 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard string.c
/php-srcNEWS
Log:
- MFH: Fixed memory corruption in stristr().
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.420.2.9r2=1.420.2.10ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.420.2.9
php-src/ext/standard/string.c:1.420.2.10
--- php-src/ext/standard/string.c:1.420.2.9 Tue May 31 08:55:33 2005
+++ php-src/ext/standard/string.c Thu Jun 2 04:31:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.420.2.9 2005/05/31 12:55:33 sniper Exp $ */
+/* $Id: string.c,v 1.420.2.10 2005/06/02 08:31:02 derick Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1382,8 +1382,8 @@
if (!Z_STRLEN_PP(needle)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Empty
delimiter.);
efree(haystack_orig);
- zval_ptr_dtor(haystack);
- zval_ptr_dtor(needle);
+// zval_ptr_dtor(haystack);
+// zval_ptr_dtor(needle);
RETURN_FALSE;
}
@@ -1409,8 +1409,8 @@
RETVAL_FALSE;
}
- zval_ptr_dtor(haystack);
- zval_ptr_dtor(needle);
+// zval_ptr_dtor(haystack);
+// zval_ptr_dtor(needle);
efree(haystack_orig);
}
/* }}} */
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.411r2=1.1760.2.412ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.411 php-src/NEWS:1.1760.2.412
--- php-src/NEWS:1.1760.2.411 Wed Jun 1 18:28:37 2005
+++ php-src/NEWSThu Jun 2 04:31:03 2005
@@ -12,6 +12,7 @@
- Fixed ext/mysqli to allocate less memory when fetching bound params
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- Fixed memory corruption in stristr(). (Derick)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
--
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) / NEWS /ext/odbc php_odbc.c
tony2001Thu Jun 2 11:42:45 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/odbc php_odbc.c
/php-srcNEWS
Log:
MFH: fix bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches).
Path by rich at kastle dot com.
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.179.2.3r2=1.179.2.4ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.179.2.3
php-src/ext/odbc/php_odbc.c:1.179.2.4
--- php-src/ext/odbc/php_odbc.c:1.179.2.3 Tue Jan 18 10:07:10 2005
+++ php-src/ext/odbc/php_odbc.c Thu Jun 2 11:42:44 2005
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_odbc.c,v 1.179.2.3 2005/01/18 15:07:10 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.179.2.4 2005/06/02 15:42:44 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -2437,8 +2437,10 @@
result-values = NULL;
}
RETURN_TRUE;
- }
- else {
+ } else if (rc == SQL_NO_DATA_FOUND) {
+ RETURN_FALSE;
+ } else {
+ odbc_sql_error(result-conn_ptr, result-stmt,
SQLMoreResults);
RETURN_FALSE;
}
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.412r2=1.1760.2.413ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.412 php-src/NEWS:1.1760.2.413
--- php-src/NEWS:1.1760.2.412 Thu Jun 2 04:31:03 2005
+++ php-src/NEWSThu Jun 2 11:42:44 2005
@@ -13,6 +13,8 @@
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
+- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
+ 2-statement SQL batches). (rich at kastle dot com, Tony)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
--
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) / NEWS /ext/curl interface.c php_curl.h
tony2001Thu Jun 2 17:04:43 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/curl interface.c php_curl.h
Log:
MFH: fix bug #33222 (segfault when CURL handle is closed in a callback).
fix segfaults when CURL callback functions throw exception.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.413r2=1.1760.2.414ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.413 php-src/NEWS:1.1760.2.414
--- php-src/NEWS:1.1760.2.413 Thu Jun 2 11:42:44 2005
+++ php-src/NEWSThu Jun 2 17:04:43 2005
@@ -13,6 +13,8 @@
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed memory corruption in stristr(). (Derick)
+- Fixed segfaults when CURL callback functions throw exception. (Tony)
+- Fixed bug #33222 (segfault when CURL handle is closed in a callback). (Tony)
- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches). (rich at kastle dot com, Tony)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.46.2.7r2=1.46.2.8ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.46.2.7
php-src/ext/curl/interface.c:1.46.2.8
--- php-src/ext/curl/interface.c:1.46.2.7 Mon Mar 14 04:02:42 2005
+++ php-src/ext/curl/interface.cThu Jun 2 17:04:43 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.46.2.7 2005/03/14 09:02:42 sniper Exp $ */
+/* $Id: interface.c,v 1.46.2.8 2005/06/02 21:04:43 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -484,20 +484,22 @@
fci.no_separation = 0;
fci.symbol_table = NULL;
+ ch-in_callback = 1;
error = zend_call_function(fci, t-fci_cache
TSRMLS_CC);
+ ch-in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Could not call the CURLOPT_WRITEFUNCTION);
length = -1;
- } else {
+ } else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) != IS_LONG) {
convert_to_long_ex(retval_ptr);
}
length = Z_LVAL_P(retval_ptr);
+ zval_ptr_dtor(retval_ptr);
}
zval_ptr_dtor(argv[0]);
zval_ptr_dtor(argv[1]);
- zval_ptr_dtor(retval_ptr);
break;
}
}
@@ -554,20 +556,22 @@
fci.no_separation = 0;
fci.symbol_table = NULL;
+ ch-in_callback = 1;
error = zend_call_function(fci, t-fci_cache
TSRMLS_CC);
+ ch-in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Cannot call the CURLOPT_READFUNCTION);
- } else {
+ } else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) == IS_STRING) {
length = MIN(size * nmemb,
Z_STRLEN_P(retval_ptr));
memcpy(data, Z_STRVAL_P(retval_ptr),
length);
}
+ zval_ptr_dtor(retval_ptr);
}
zval_ptr_dtor(argv[0]);
zval_ptr_dtor(argv[1]);
zval_ptr_dtor(argv[2]);
- zval_ptr_dtor(retval_ptr);
break;
}
}
@@ -625,19 +629,21 @@
fci.params = argv;
fci.no_separation = 0;
+ ch-in_callback = 1;
error = zend_call_function(fci, t-fci_cache
TSRMLS_CC);
+ ch-in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING,
Could not call the CURLOPT_HEADERFUNCTION);
length = -1;
- } else {
+ } else if (retval_ptr) {
if (Z_TYPE_P(retval_ptr) != IS_LONG) {
convert_to_long_ex(retval_ptr);
}
length = Z_LVAL_P(retval_ptr);
+ zval_ptr_dtor(retval_ptr);
}
zval_ptr_dtor(argv[0]);
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS configure.in
sniper Thu Jun 2 17:32:10 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS configure.in Log: MFH: - Fixed bug #28605 (Need to use -[m]ieee option for Alpha CPUs) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.414r2=1.1760.2.415ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.414 php-src/NEWS:1.1760.2.415 --- php-src/NEWS:1.1760.2.414 Thu Jun 2 17:04:43 2005 +++ php-src/NEWSThu Jun 2 17:32:09 2005 @@ -142,6 +142,7 @@ mem vars und others). (Dmitry) - Fixed bug #28839 (SIGSEGV in interactive mode (php -a)). (kameshj at fastmail dot fm) +- Fixed bug #28605 (Need to use -[m]ieee option for Alpha CPUs). (Jani) - Fixed bug #22836 (returning reference to uninitialized variable). (Dmitry) 31 Mar 2005, PHP 5.0.4 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514.2.50r2=1.514.2.51ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.514.2.50 php-src/configure.in:1.514.2.51 --- php-src/configure.in:1.514.2.50 Sat Apr 30 00:30:19 2005 +++ php-src/configure.inThu Jun 2 17:32:09 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.514.2.50 2005/04/30 04:30:19 sniper Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.514.2.51 2005/06/02 21:32:09 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -180,6 +180,17 @@ dnl Platform-specific compile settings. dnl - +dnl See bug #28605 +case $host_cpu in +alpha*) +if test $GCC = yes; then + CFLAGS=$CFLAGS -mieee +else + CFLAGS=$CFLAGS -ieee +fi +;; +esac + case $host_alias in *solaris*) CPPFLAGS=$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS -- 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) / NEWS /ext/soap php_encoding.c php_schema.c php_sdl.c /ext/soap/tests/bugs bug32941.phpt bug32941.wsdl
dmitry Wed Jun 1 10:42:50 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/soap/tests/bugsbug32941.phpt bug32941.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap php_encoding.c php_schema.c php_sdl.c
Log:
Fixed bug #32941 (Sending structured SOAP fault kills a php)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.409r2=1.1760.2.410ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.409 php-src/NEWS:1.1760.2.410
--- php-src/NEWS:1.1760.2.409 Wed Jun 1 06:53:57 2005
+++ php-src/NEWSWed Jun 1 10:42:48 2005
@@ -35,6 +35,7 @@
- Fixed bug #32947 (Incorrect option for mysqli default password). (Georg)
- Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading
session cookies). (Jani, Tony)
+- Fixed bug #32941 (Sending structured SOAP fault kills a php). (Dmitry)
- Fixed bug #32936 (http redirects URLs are not checked for control chars).
(Ilia)
- Fixed bug #32933 (Cannot extend class SQLiteDatabase). (Marcus)
- Fixed bug #32932 (Oracle LDAP: ldap_get_entries(), invalid pointer). (Jani)
http://cvs.php.net/diff.php/php-src/ext/soap/php_encoding.c?r1=1.71.2.18r2=1.71.2.19ty=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.71.2.18
php-src/ext/soap/php_encoding.c:1.71.2.19
--- php-src/ext/soap/php_encoding.c:1.71.2.18 Wed Apr 20 04:31:09 2005
+++ php-src/ext/soap/php_encoding.c Wed Jun 1 10:42:49 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.71.2.18 2005/04/20 08:31:09 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.71.2.19 2005/06/01 14:42:49 dmitry Exp $ */
#include time.h
@@ -2297,6 +2297,9 @@
if (tmpattr != NULL) {
type_name = tmpattr-children-content;
enc = get_encoder_from_prefix(SOAP_GLOBAL(sdl), data,
tmpattr-children-content);
+ if (type == enc-details) {
+ enc = NULL;
+ }
if (enc != NULL) {
encodePtr tmp = enc;
while (tmp
http://cvs.php.net/diff.php/php-src/ext/soap/php_schema.c?r1=1.49.2.5r2=1.49.2.6ty=u
Index: php-src/ext/soap/php_schema.c
diff -u php-src/ext/soap/php_schema.c:1.49.2.5
php-src/ext/soap/php_schema.c:1.49.2.6
--- php-src/ext/soap/php_schema.c:1.49.2.5 Wed Apr 20 04:31:10 2005
+++ php-src/ext/soap/php_schema.c Wed Jun 1 10:42:50 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_schema.c,v 1.49.2.5 2005/04/20 08:31:10 dmitry Exp $ */
+/* $Id: php_schema.c,v 1.49.2.6 2005/06/01 14:42:50 dmitry Exp $ */
#include php_soap.h
#include libxml/uri.h
@@ -88,20 +88,10 @@
static encodePtr get_create_encoder(sdlPtr sdl, sdlTypePtr cur_type, const
char *ns, const char *type)
{
- encodePtr enc = NULL;
- smart_str nscat = {0};
-
- smart_str_appends(nscat, ns);
- smart_str_appendc(nscat, ':');
- smart_str_appends(nscat, type);
- smart_str_0(nscat);
-
- enc = get_encoder_ex(sdl, nscat.c, nscat.len);
+ encodePtr enc = get_encoder(sdl, ns, type);
if (enc == NULL) {
enc = create_encoder(sdl, cur_type, ns, type);
}
-
- smart_str_free(nscat);
return enc;
}
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.70.2.10r2=1.70.2.11ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.70.2.10
php-src/ext/soap/php_sdl.c:1.70.2.11
--- php-src/ext/soap/php_sdl.c:1.70.2.10Fri Apr 29 01:38:31 2005
+++ php-src/ext/soap/php_sdl.c Wed Jun 1 10:42:50 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.70.2.10 2005/04/29 05:38:31 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.70.2.11 2005/06/01 14:42:50 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -50,21 +50,10 @@
parse_namespace(type, cptype, ns);
nsptr = xmlSearchNs(node-doc, node, ns);
if (nsptr != NULL) {
- int ns_len = strlen(nsptr-href);
- int type_len = strlen(cptype);
- int len = ns_len + type_len + 1;
- char *nscat = emalloc(len + 1);
-
- memcpy(nscat, nsptr-href, ns_len);
- nscat[ns_len] = ':';
- memcpy(nscat+ns_len+1, cptype, type_len);
- nscat[len] = '\0';
-
- enc = get_encoder_ex(sdl, nscat, len);
+ enc = get_encoder(sdl, nsptr-href, cptype);
if (enc == NULL) {
-
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/standard image.c
iliaa Wed Jun 1 18:28:38 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/standard image.c
Log:
MFH: Fixed bug #33210 (relax jpeg recursive loop protection).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.410r2=1.1760.2.411ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.410 php-src/NEWS:1.1760.2.411
--- php-src/NEWS:1.1760.2.410 Wed Jun 1 10:42:48 2005
+++ php-src/NEWSWed Jun 1 18:28:37 2005
@@ -12,6 +12,7 @@
- Fixed ext/mysqli to allocate less memory when fetching bound params
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
- Fixed bug #33185 (--enable-session=shared does not build). (Jani)
http://cvs.php.net/diff.php/php-src/ext/standard/image.c?r1=1.98.2.8r2=1.98.2.9ty=u
Index: php-src/ext/standard/image.c
diff -u php-src/ext/standard/image.c:1.98.2.8
php-src/ext/standard/image.c:1.98.2.9
--- php-src/ext/standard/image.c:1.98.2.8 Sun Mar 6 12:04:22 2005
+++ php-src/ext/standard/image.cWed Jun 1 18:28:38 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: image.c,v 1.98.2.8 2005/03/06 17:04:22 iliaa Exp $ */
+/* $Id: image.c,v 1.98.2.9 2005/06/01 22:28:38 iliaa Exp $ */
#include php.h
#include stdio.h
@@ -401,7 +401,7 @@
last_marker = M_PSEUDO; /* stop skipping non
0xff for M_COM */
}
}
- if (++a 10)
+ if (++a 25)
{
/* who knows the maxim amount of 0xff? though 7 */
/* but found other implementations */
--
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) / NEWS /ext/pcre php_pcre.c /ext/pcre/tests bug33200.phpt /ext/standard php_string.h string.c
sniper Tue May 31 08:55:34 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/pcre/tests bug33200.phpt
Modified files:
/php-srcNEWS
/php-src/ext/pcre php_pcre.c
/php-src/ext/standard php_string.h string.c
Log:
MFH: - Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e'
modifier misbehave)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.407r2=1.1760.2.408ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.407 php-src/NEWS:1.1760.2.408
--- php-src/NEWS:1.1760.2.407 Mon May 30 19:46:27 2005
+++ php-src/NEWSTue May 31 08:55:32 2005
@@ -12,6 +12,8 @@
- Fixed ext/mysqli to allocate less memory when fetching bound params
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
+ misbehave). (Jani)
- Fixed bug #33185 (--enable-session=shared does not build). (Jani)
- Fixed bug #33164 (Soap extension incorrectly detects HTTP/1.1). (Ilia)
- Fixed bug #33116 (crash when assigning class name to global variable in
http://cvs.php.net/diff.php/php-src/ext/pcre/php_pcre.c?r1=1.157.2.4r2=1.157.2.5ty=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.157.2.4
php-src/ext/pcre/php_pcre.c:1.157.2.5
--- php-src/ext/pcre/php_pcre.c:1.157.2.4 Tue May 24 18:11:39 2005
+++ php-src/ext/pcre/php_pcre.c Tue May 31 08:55:33 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_pcre.c,v 1.157.2.4 2005/05/24 22:11:39 andrei Exp $ */
+/* $Id: php_pcre.c,v 1.157.2.5 2005/05/31 12:55:33 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -761,9 +761,9 @@
in instead of the backref */
match = subject + offsets[backref1];
match_len = offsets[(backref1)+1] -
offsets[backref1];
- if (match_len)
- esc_match =
php_addslashes(match, match_len, esc_match_len, 0 TSRMLS_CC);
- else {
+ if (match_len) {
+ esc_match =
php_addslashes_ex(match, match_len, esc_match_len, 0, 1 TSRMLS_CC);
+ } else {
esc_match = match;
esc_match_len = 0;
}
http://cvs.php.net/diff.php/php-src/ext/standard/php_string.h?r1=1.84.2.1r2=1.84.2.2ty=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.84.2.1
php-src/ext/standard/php_string.h:1.84.2.2
--- php-src/ext/standard/php_string.h:1.84.2.1 Wed Nov 3 18:27:26 2004
+++ php-src/ext/standard/php_string.h Tue May 31 08:55:33 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_string.h,v 1.84.2.1 2004/11/03 23:27:26 derick Exp $ */
+/* $Id: php_string.h,v 1.84.2.2 2005/05/31 12:55:33 sniper Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -119,6 +119,7 @@
PHPAPI char *php_strtolower(char *s, size_t len);
PHPAPI char *php_strtr(char *str, int len, char *str_from, char *str_to, int
trlen);
PHPAPI char *php_addslashes(char *str, int length, int *new_length, int freeit
TSRMLS_DC);
+PHPAPI char *php_addslashes_ex(char *str, int length, int *new_length, int
freeit, int ignore_sybase TSRMLS_DC);
PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int
freeit, char *what, int wlength TSRMLS_DC);
PHPAPI void php_stripslashes(char *str, int *len TSRMLS_DC);
PHPAPI void php_stripcslashes(char *str, int *len);
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.420.2.8r2=1.420.2.9ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.420.2.8
php-src/ext/standard/string.c:1.420.2.9
--- php-src/ext/standard/string.c:1.420.2.8 Fri May 20 10:24:16 2005
+++ php-src/ext/standard/string.c Tue May 31 08:55:33 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.420.2.8 2005/05/20 14:24:16 tony2001 Exp $ */
+/* $Id: string.c,v 1.420.2.9 2005/05/31 12:55:33 sniper Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2862,6 +2862,14 @@
*/
PHPAPI char *php_addslashes(char *str, int length, int *new_length, int
should_free TSRMLS_DC)
{
+ return php_addslashes_ex(str, length, new_length, should_free, 0
TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ php_addslashes_ex
+ */
+PHPAPI char *php_addslashes_ex(char *str, int length, int *new_length, int
should_free, int ignore_sybase
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/soap soap.c /ext/sqlite sess_sqlite.c sqlite.c /ext/wddx wddx.c
sniper Mon May 30 11:13:58 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap soap.c
/php-src/ext/sqlite sess_sqlite.c sqlite.c
/php-src/ext/wddx wddx.c
Log:
- Fixed bug #33185 (--enable-session=shared does not build)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.405r2=1.1760.2.406ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.405 php-src/NEWS:1.1760.2.406
--- php-src/NEWS:1.1760.2.405 Fri May 27 14:07:30 2005
+++ php-src/NEWSMon May 30 11:13:56 2005
@@ -12,6 +12,7 @@
- Fixed ext/mysqli to allocate less memory when fetching bound params
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- Fixed bug #33185 (--enable-session=shared does not build). (Jani)
- Fixed bug #33116 (crash when assigning class name to global variable in
__autoload). (Dmitry)
- Fixed bug #33090 (mysqli_prepare() doesn't return an error). (Georg)
http://cvs.php.net/diff.php/php-src/ext/soap/soap.c?r1=1.110.2.36r2=1.110.2.37ty=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.110.2.36 php-src/ext/soap/soap.c:1.110.2.37
--- php-src/ext/soap/soap.c:1.110.2.36 Wed May 11 17:16:44 2005
+++ php-src/ext/soap/soap.c Mon May 30 11:13:57 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.110.2.36 2005/05/11 21:16:44 tony2001 Exp $ */
+/* $Id: soap.c,v 1.110.2.37 2005/05/30 15:13:57 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1479,7 +1479,7 @@
if (service-type == SOAP_CLASS) {
soap_obj = NULL;
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION)
/* If persistent then set soap_obj from from the previous
created session (if available) */
if (service-soap_class.persistance ==
SOAP_PERSISTENCE_SESSION) {
zval **tmp_soap;
@@ -1568,7 +1568,7 @@
}
efree(class_name);
}
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION)
/* If session then update session hash with new object
*/
if (service-soap_class.persistance ==
SOAP_PERSISTENCE_SESSION) {
zval **tmp_soap_pp;
@@ -1661,7 +1661,7 @@
zend_hash_exists(function_table, ZEND_CALL_FUNC_NAME,
sizeof(ZEND_CALL_FUNC_NAME {
if (service-type == SOAP_CLASS) {
call_status = call_user_function(NULL, soap_obj,
function_name, retval, num_params, params TSRMLS_CC);
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION)
if (service-soap_class.persistance !=
SOAP_PERSISTENCE_SESSION) {
zval_ptr_dtor(soap_obj);
}
http://cvs.php.net/diff.php/php-src/ext/sqlite/sess_sqlite.c?r1=1.16r2=1.16.2.1ty=u
Index: php-src/ext/sqlite/sess_sqlite.c
diff -u php-src/ext/sqlite/sess_sqlite.c:1.16
php-src/ext/sqlite/sess_sqlite.c:1.16.2.1
--- php-src/ext/sqlite/sess_sqlite.c:1.16 Sun Mar 7 17:35:26 2004
+++ php-src/ext/sqlite/sess_sqlite.cMon May 30 11:13:57 2005
@@ -17,11 +17,11 @@
+--+
*/
-/* $Id: sess_sqlite.c,v 1.16 2004/03/07 22:35:26 sas Exp $ */
+/* $Id: sess_sqlite.c,v 1.16.2.1 2005/05/30 15:13:57 sniper Exp $ */
#include php.h
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION)
#include ext/session/php_session.h
#include ext/standard/php_lcg.h
@@ -185,7 +185,7 @@
return SQLITE_RETVAL(rv);
}
-#endif /* HAVE_PHP_SESSION */
+#endif /* HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION) */
/*
* Local variables:
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.146.2.5r2=1.146.2.6ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.146.2.5
php-src/ext/sqlite/sqlite.c:1.146.2.6
--- php-src/ext/sqlite/sqlite.c:1.146.2.5 Thu May 26 07:56:03 2005
+++ php-src/ext/sqlite/sqlite.c Mon May 30 11:13:57 2005
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.146.2.5 2005/05/26 11:56:03 helly Exp $
+ $Id: sqlite.c,v 1.146.2.6 2005/05/30 15:13:57 sniper Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -49,7 +49,7 @@
ZEND_DECLARE_MODULE_GLOBALS(sqlite)
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION !defined(COMPILE_DL_SESSION)
extern ps_module ps_mod_sqlite;
#define ps_sqlite_ptr ps_mod_sqlite
#endif
@@ -1015,7 +1015,7 @@
REGISTER_INI_ENTRIES();
-#if HAVE_PHP_SESSION
+#if HAVE_PHP_SESSION
[PHP-CVS] cvs: php-src(PHP_5_0) / NEWS /ext/soap php_http.c
iliaa Mon May 30 19:46:28 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/soap php_http.c
Log:
MFH: Fixed bug #33164 (Soap extension incorrectly detects HTTP/1.1).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.406r2=1.1760.2.407ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.406 php-src/NEWS:1.1760.2.407
--- php-src/NEWS:1.1760.2.406 Mon May 30 11:13:56 2005
+++ php-src/NEWSMon May 30 19:46:27 2005
@@ -13,6 +13,7 @@
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
- Fixed bug #33185 (--enable-session=shared does not build). (Jani)
+- Fixed bug #33164 (Soap extension incorrectly detects HTTP/1.1). (Ilia)
- Fixed bug #33116 (crash when assigning class name to global variable in
__autoload). (Dmitry)
- Fixed bug #33090 (mysqli_prepare() doesn't return an error). (Georg)
http://cvs.php.net/diff.php/php-src/ext/soap/php_http.c?r1=1.55.2.17r2=1.55.2.18ty=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.55.2.17
php-src/ext/soap/php_http.c:1.55.2.18
--- php-src/ext/soap/php_http.c:1.55.2.17 Mon May 23 02:25:02 2005
+++ php-src/ext/soap/php_http.c Mon May 30 19:46:28 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_http.c,v 1.55.2.17 2005/05/23 06:25:02 dmitry Exp $ */
+/* $Id: php_http.c,v 1.55.2.18 2005/05/30 23:46:28 iliaa Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -686,7 +686,7 @@
if (http_version) {
char *tmp;
- if (strncmp(http_version,1.1, 3)) {
+ if (!strncmp(http_version,1.1, 3)) {
http_1_1 = 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) / NEWS
sniper Fri May 27 03:21:11 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: Move BFN to correct version.. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.402r2=1.1760.2.403ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.402 php-src/NEWS:1.1760.2.403 --- php-src/NEWS:1.1760.2.402 Thu May 26 10:40:10 2005 +++ php-src/NEWSFri May 27 03:21:11 2005 @@ -101,6 +101,7 @@ (Stas, Dmitry) - Fixed bug #31502 (Wrong deserialization from session when using WDDX serializer). (Dmitry) +- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia) - Fixed bug #31363 (broken non-blocking flock()). ian at snork dot net - Fixed bug #30889 (Conflict between __get/__set and ++ operator). (Dmitry) - Fixed bug #30833 (array_count_values() modifying input array). (Tony) @@ -221,7 +222,6 @@ translation). (Ilia) - Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia) - Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen strlen). (Ilia) -- Fixed bug #31465 (False warning in unpack() when working with *). (Ilia) - Fixed bug #31454 (session_set_save_handler crashes PHP when supplied non-existent object ref). (Tony) - Fixed bug #31444 (Memory leak in zend_language_scanner.c). -- 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) / NEWS
helly Thu May 26 07:59:39 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.400r2=1.1760.2.401ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.400 php-src/NEWS:1.1760.2.401 --- php-src/NEWS:1.1760.2.400 Wed May 25 13:41:17 2005 +++ php-src/NEWSThu May 26 07:59:36 2005 @@ -29,6 +29,7 @@ - Fixed bug #32944 (Disabling session.use_cookies doesn't prevent reading session cookies). (Jani, Tony) - Fixed bug #32936 (http redirects URLs are not checked for control chars). (Ilia) +- Fixed bug #32933 (Cannot extend class SQLiteDatabase). (Marcus) - Fixed bug #32932 (Oracle LDAP: ldap_get_entries(), invalid pointer). (Jani) - Fixed bug #32930 (class extending DOMDocument doesn't clone properly). (Rob) - Fixed bug #32904 (pg_get_notify() ignores result_type parameter). (Tony) -- 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) / NEWS /main php_variables.c /tests/basic bug29971.phpt
dmitry Wed May 25 13:41:19 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/tests/basicbug29971.phpt
Modified files:
/php-srcNEWS
/php-src/main php_variables.c
Log:
Fixed bug #29971 (variables_order behaviour)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.399r2=1.1760.2.400ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.399 php-src/NEWS:1.1760.2.400
--- php-src/NEWS:1.1760.2.399 Mon May 23 17:49:48 2005
+++ php-src/NEWSWed May 25 13:41:17 2005
@@ -113,6 +113,7 @@
(Marcus)
- Fixed bug #29975 (memory leaks when set_error_handler() is used inside error
handler). (Tony)
+- Fixed bug #29971 (variables_order behaviour). (Dmitry)
- Fixed bug #29944 (Function defined in switch, crashes). (Dmitry)
- Fixed bug #29583 (crash when echoing a COM object). (M.Sisolak, Wez)
- Fixed bug #29338 (unencoded spaces get ignored after certain tags). (Ilia)
http://cvs.php.net/diff.php/php-src/main/php_variables.c?r1=1.81.2.8r2=1.81.2.9ty=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.81.2.8
php-src/main/php_variables.c:1.81.2.9
--- php-src/main/php_variables.c:1.81.2.8 Mon Apr 25 17:18:41 2005
+++ php-src/main/php_variables.cWed May 25 13:41:18 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.81.2.8 2005/04/25 21:18:41 sniper Exp $ */
+/* $Id: php_variables.c,v 1.81.2.9 2005/05/25 17:41:18 dmitry Exp $ */
#include stdio.h
#include php.h
@@ -707,7 +707,15 @@
static zend_bool php_auto_globals_create_server(char *name, uint name_len
TSRMLS_DC)
{
- php_register_server_variables(TSRMLS_C);
+ if (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s'))
{
+ php_register_server_variables(TSRMLS_C);
+ } else {
+ zval *server_vars=NULL;
+ ALLOC_ZVAL(server_vars);
+ array_init(server_vars);
+ INIT_PZVAL(server_vars);
+ PG(http_globals)[TRACK_VARS_SERVER] = server_vars;
+ }
zend_hash_update(EG(symbol_table), name, name_len+1,
PG(http_globals)[TRACK_VARS_SERVER], sizeof(zval *), NULL);
PG(http_globals)[TRACK_VARS_SERVER]-refcount++;
@@ -729,7 +737,9 @@
INIT_PZVAL(env_vars);
PG(http_globals)[TRACK_VARS_ENV] = env_vars;
- php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV]
TSRMLS_CC);
+ if (strchr(PG(variables_order),'E') || strchr(PG(variables_order),'e'))
{
+
php_import_environment_variables(PG(http_globals)[TRACK_VARS_ENV] TSRMLS_CC);
+ }
zend_hash_update(EG(symbol_table), name, name_len+1,
PG(http_globals)[TRACK_VARS_ENV], sizeof(zval *), NULL);
PG(http_globals)[TRACK_VARS_ENV]-refcount++;
http://cvs.php.net/co.php/php-src/tests/basic/bug29971.phpt?r=1.1p=1
Index: php-src/tests/basic/bug29971.phpt
+++ php-src/tests/basic/bug29971.phpt
--
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) / NEWS
sniper Mon May 23 02:49:48 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: Missed the bus now.. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.394r2=1.1760.2.395ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.394 php-src/NEWS:1.1760.2.395 --- php-src/NEWS:1.1760.2.394 Sun May 22 12:41:33 2005 +++ php-src/NEWSMon May 23 02:49:48 2005 @@ -2,7 +2,7 @@ ||| ?? ??? 2005, PHP 5.0.5 - Removed php_check_syntax() function which never worked properly. (Ilia) -- Added new function mysqli_set_charset (Georg) +- Added new function mysqli_set_charset(). (Georg) - Added man pages for phpize and php-config scripts. (Jakub Vrana) - Added support for .cc files in extensions. (Brian) - Added PHP_INT_MAX and PHP_INT_SIZE as predefined constants. (Andrey) @@ -11,11 +11,11 @@ - Fixed ext/mysqli to allocate less memory when fetching bound params of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey) - Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey) -- Fixed bug #33090 (mysqli_prepare doesn't return an error). (Georg) +- Fixed bug #33090 (mysqli_prepare() doesn't return an error). (Georg) - Fixed bug #33076 (str_ireplace() incorrectly counts result string length and may cause segfault). (Tony) -- Fixed bug #33072 (Add a safemode/open_basedir check for runtime save_path - change) (Rasmus) +- Fixed bug #33072 (Add a safemode/open_basedir check for runtime + session.save_path change using session_save_path() function). (Rasmus) - Fixed bug #33059 (crash when moving xml attribute set in dtd). (Ilia) - Fixed bug #33057 (Don't send extraneous entity-headers on a 304 as per RFC 2616 section 10.3.5) (Rasmus, Choitel) -- 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) / NEWS
tony2001Mon May 23 07:52:23 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.396r2=1.1760.2.397ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.396 php-src/NEWS:1.1760.2.397 --- php-src/NEWS:1.1760.2.396 Mon May 23 05:41:50 2005 +++ php-src/NEWSMon May 23 07:52:23 2005 @@ -35,6 +35,7 @@ - Fixed bug #32852 (Crash with singleton and __destruct when zend.ze1_compatibility_mode = On). (Dmitry) - Fixed bug #32813 (parse_url() does not handle scheme-only urls properly). (Ilia) +- Fixed bug #32810 (fread after tmpfile() reads only 8192 bytes). (Tony) - Fixed bug #32809 (Missing T1LIB support on Windows). (Edin) - Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia) - Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani) -- 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) / NEWS /main/streams streams.c
tony2001Mon May 23 11:37:11 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/main/streams streams.c
Log:
revert by Wez's request
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.397r2=1.1760.2.398ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.397 php-src/NEWS:1.1760.2.398
--- php-src/NEWS:1.1760.2.397 Mon May 23 07:52:23 2005
+++ php-src/NEWSMon May 23 11:37:10 2005
@@ -35,7 +35,6 @@
- Fixed bug #32852 (Crash with singleton and __destruct when
zend.ze1_compatibility_mode = On). (Dmitry)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
-- Fixed bug #32810 (fread after tmpfile() reads only 8192 bytes). (Tony)
- Fixed bug #32809 (Missing T1LIB support on Windows). (Edin)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.61.2.12r2=1.61.2.13ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.61.2.12
php-src/main/streams/streams.c:1.61.2.13
--- php-src/main/streams/streams.c:1.61.2.12Mon May 23 07:52:12 2005
+++ php-src/main/streams/streams.c Mon May 23 11:37:10 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.61.2.12 2005/05/23 11:52:12 tony2001 Exp $ */
+/* $Id: streams.c,v 1.61.2.13 2005/05/23 15:37:10 tony2001 Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -592,7 +592,7 @@
}
/* just break anyway, to avoid greedy read */
- if (stream-wrapper != NULL stream-wrapper !=
php_plain_files_wrapper) {
+ if (stream-wrapper != php_plain_files_wrapper) {
break;
}
}
--
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) / NEWS /main/streams plain_wrapper.c
iliaa Mon May 23 17:49:53 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/main/streams plain_wrapper.c
Log:
MFH: Fixed bug #32810 (temporary files not using plain file wrapper).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.398r2=1.1760.2.399ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.398 php-src/NEWS:1.1760.2.399
--- php-src/NEWS:1.1760.2.398 Mon May 23 11:37:10 2005
+++ php-src/NEWSMon May 23 17:49:48 2005
@@ -35,6 +35,7 @@
- Fixed bug #32852 (Crash with singleton and __destruct when
zend.ze1_compatibility_mode = On). (Dmitry)
- Fixed bug #32813 (parse_url() does not handle scheme-only urls properly).
(Ilia)
+- Fixed bug #32810 (temporary files not using plain file wrapper). (Ilia)
- Fixed bug #32809 (Missing T1LIB support on Windows). (Edin)
- Fixed bug #32802 (General cookie overrides more specific cookie). (Ilia)
- Fixed bugs #32800, #32830 (ext/odbc: Problems with 64bit systems). (Jani)
http://cvs.php.net/diff.php/php-src/main/streams/plain_wrapper.c?r1=1.39.2.5r2=1.39.2.6ty=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.39.2.5
php-src/main/streams/plain_wrapper.c:1.39.2.6
--- php-src/main/streams/plain_wrapper.c:1.39.2.5 Thu Apr 7 03:28:53 2005
+++ php-src/main/streams/plain_wrapper.cMon May 23 17:49:53 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.39.2.5 2005/04/07 07:28:53 thetaphi Exp $ */
+/* $Id: plain_wrapper.c,v 1.39.2.6 2005/05/23 21:49:53 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -154,6 +154,7 @@
if (fd != -1) {
php_stream *stream = php_stream_fopen_from_fd_rel(fd, r+b,
NULL);
if (stream) {
+ stream-wrapper = php_plain_files_wrapper;
php_stdio_stream_data *self =
(php_stdio_stream_data*)stream-abstract;
self-temp_file_name = opened_path;
--
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) / NEWS /tests/strings 004.phpt
iliaa Sun May 22 12:41:34 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/tests/strings 004.phpt /php-srcNEWS Log: MFH: adjust highlight test. http://cvs.php.net/diff.php/php-src/tests/strings/004.phpt?r1=1.5r2=1.5.2.1ty=u Index: php-src/tests/strings/004.phpt diff -u php-src/tests/strings/004.phpt:1.5 php-src/tests/strings/004.phpt:1.5.2.1 --- php-src/tests/strings/004.phpt:1.5 Wed May 19 04:54:52 2004 +++ php-src/tests/strings/004.phpt Sun May 22 12:41:33 2005 @@ -15,8 +15,8 @@ ? --EXPECT-- codespan style=color: #00 -lt;br /gt;span style=color: #BBlt;?php /spanspan style=color: #007700echo /spanspan style=color: #DDfoo/spanspan style=color: #007700; /spanspan style=color: #BB?gt;/spanlt;br /gt;/span +lt;brnbsp;/gt;span style=color: #BBlt;?phpnbsp;/spanspan style=color: #007700echonbsp;/spanspan style=color: #DDfoo/spanspan style=color: #007700;nbsp;/spanspan style=color: #BB?gt;/spanlt;brnbsp;/gt;/span /code [codespan style=color: #00 -lt;br /gt;span style=color: #BBlt;?php /spanspan style=color: #007700echo /spanspan style=color: #DDbar/spanspan style=color: #007700; /spanspan style=color: #BB?gt;/spanlt;br /gt;/span +lt;brnbsp;/gt;span style=color: #BBlt;?phpnbsp;/spanspan style=color: #007700echonbsp;/spanspan style=color: #DDbar/spanspan style=color: #007700;nbsp;/spanspan style=color: #BB?gt;/spanlt;brnbsp;/gt;/span /code] http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.393r2=1.1760.2.394ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.393 php-src/NEWS:1.1760.2.394 --- php-src/NEWS:1.1760.2.393 Sat May 21 14:54:57 2005 +++ php-src/NEWSSun May 22 12:41:33 2005 @@ -113,6 +113,7 @@ handler). (Tony) - Fixed bug #29944 (Function defined in switch, crashes). (Dmitry) - Fixed bug #29583 (crash when echoing a COM object). (M.Sisolak, Wez) +- Fixed bug #29338 (unencoded spaces get ignored after certain tags). (Ilia) - Fixed bug #29210 (Function: is_callable - no support for private and protected classes). (Dmitry) - Fixed bug #29104 (Function declaration in method doesn't work). (Dmitry) -- 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) / NEWS /ext/mysqli mysqli_api.c php_mysqli.h /ext/mysqli/tests bug33090.phpt
georg Sat May 21 04:54:57 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/mysqli/tests bug33090.phpt
Modified files:
/php-srcNEWS
/php-src/ext/mysqli php_mysqli.h mysqli_api.c
Log:
MFH:
- fix for bug #33090 (mysqli_prepare doesn't return an error)
- mysql_set_charset now works for MySQL = 5.0.6
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.391r2=1.1760.2.392ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.391 php-src/NEWS:1.1760.2.392
--- php-src/NEWS:1.1760.2.391 Fri May 20 10:24:16 2005
+++ php-src/NEWSSat May 21 04:54:50 2005
@@ -11,6 +11,7 @@
- Fixed ext/mysqli to allocate less memory when fetching bound params
of type (MEDIUM|LONG)BLOB/(MEDIUM|LONG)TEXT. (Andrey)
- Fixed memory corruption in ImageTTFText() with 64bit systems. (Andrey)
+- Fixed bug #33090 (mysqli_prepare doesn't return an error). (Georg)
- Fixed bug #33076 (str_ireplace() incorrectly counts result string length
and may cause segfault). (Tony)
- Fixed bug #33059 (crash when moving xml attribute set in dtd). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mysqli/php_mysqli.h?r1=1.38.2.5r2=1.38.2.6ty=u
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.38.2.5
php-src/ext/mysqli/php_mysqli.h:1.38.2.6
--- php-src/ext/mysqli/php_mysqli.h:1.38.2.5Fri May 13 09:53:08 2005
+++ php-src/ext/mysqli/php_mysqli.h Sat May 21 04:54:56 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: php_mysqli.h,v 1.38.2.5 2005/05/13 13:53:08 georg Exp $
+ $Id: php_mysqli.h,v 1.38.2.6 2005/05/21 08:54:56 georg Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -95,7 +95,7 @@
#define PHP_MYSQLI_API
#endif
-#if MYSQL_VERSION_ID 40112 MYSQL_VERSION_ID 5
+#if (MYSQL_VERSION_ID 40112 MYSQL_VERSION_ID 5) || MYSQL_VERSION_ID
50005
#define HAVE_MYSQLI_SET_CHARSET
#endif
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.87.2.19r2=1.87.2.20ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.87.2.19
php-src/ext/mysqli/mysqli_api.c:1.87.2.20
--- php-src/ext/mysqli/mysqli_api.c:1.87.2.19 Mon May 9 18:31:52 2005
+++ php-src/ext/mysqli/mysqli_api.c Sat May 21 04:54:56 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter [EMAIL PROTECTED]|
+--+
- $Id: mysqli_api.c,v 1.87.2.19 2005/05/09 22:31:52 andrey Exp $
+ $Id: mysqli_api.c,v 1.87.2.20 2005/05/21 08:54:56 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1074,7 +1074,7 @@
}
/* }}} */
-/* {{{ proto mysqli_set_local_infile_default(object link)
+/* {{{ proto void mysqli_set_local_infile_default(object link)
unsets user defined handler for load local infile command */
PHP_FUNCTION(mysqli_set_local_infile_default)
{
@@ -1279,14 +1279,22 @@
if ((stmt-stmt = mysql_stmt_init(mysql-mysql))) {
if (mysql_stmt_prepare(stmt-stmt, query, query_len)) {
- if (stmt-stmt-last_errno) {
- /* if we close the statement handle, we have to
copy the errors to connection handle */
- mysql-mysql-net.last_errno =
stmt-stmt-last_errno;
- strcpy(mysql-mysql-net.last_error,
stmt-stmt-last_error);
- strcpy(mysql-mysql-net.sqlstate,
stmt-stmt-sqlstate);
- }
+ char last_error[MYSQL_ERRMSG_SIZE];
+ char sqlstate[SQLSTATE_LENGTH+1];
+ unsigned int last_errno;
+
+ /* mysql_stmt_close clears errors, so we have to store
them temporarily */
+ last_errno = stmt-stmt-last_errno;
+ memcpy(last_error, stmt-stmt-last_error,
MYSQL_ERRMSG_SIZE);
+ memcpy(sqlstate, mysql-mysql-net.sqlstate,
SQLSTATE_LENGTH+1);
+
mysql_stmt_close(stmt-stmt);
stmt-stmt = NULL;
+
+ /* restore error messages */
+ mysql-mysql-net.last_errno = last_errno;
+ memcpy(mysql-mysql-net.last_error, last_error,
MYSQL_ERRMSG_SIZE);
+ memcpy(mysql-mysql-net.sqlstate, sqlstate,
SQLSTATE_LENGTH+1);
}
}
http://cvs.php.net/co.php/php-src/ext/mysqli/tests/bug33090.phpt?r=1.1p=1
Index: php-src/ext/mysqli/tests/bug33090.phpt
+++ php-src/ext/mysqli/tests/bug33090.phpt
--TEST--
Bug #33090
--SKIPIF--
?php require_once('skipif.inc'); ?
--FILE--
?php
include (connect.inc);
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user,
