[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Nov 19 01:53:07 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2168r2=1.2169ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2168 php-src/ChangeLog:1.2169 --- php-src/ChangeLog:1.2168Fri Nov 18 01:42:17 2005 +++ php-src/ChangeLog Sat Nov 19 01:52:43 2005 @@ -1,3 +1,141 @@ +2005-11-18 Frank M. Kromann [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + NEWS + NEWS + ext/mssql/php_mssql.c + ext/mssql/php_mssql.c + ext/mssql/php_mssql.c: + MFH: Fix #33201 Crash when fetching some data types + +* NEWS + ext/mssql/php_mssql.c: + Fix #33201 Crash when fetching some data types + +* (PHP_4_4) + NEWS + NEWS + NEWS + ext/mssql/php_mssql.c + ext/mssql/php_mssql.c: + MFH Fix #33963. mssql_bind fails on input parameters + +* NEWS + ext/mssql/php_mssql.c: + Fix #33963. mssql_bind fails on input parameters + +* (PHP_4_4) + NEWS + NEWS + NEWS + ext/mssql/php_mssql.c + ext/mssql/php_mssql.c + ext/mssql/php_mssql.c: + MFH: Fix #32009 crash when mssql_bind() is called more than once + +* NEWS + ext/mssql/php_mssql.c: + Fix #32009 crash when mssql_bind() is called more than once + +* (PHP_4_4) + NEWS + NEWS + NEWS + ext/mssql/php_mssql.c + ext/mssql/php_mssql.c + ext/mssql/php_mssql.c: + MFH: Fix #33153 Crash in mssql_next_result(). + +* NEWS + ext/mssql/php_mssql.c: + Fix #33153 Crash in mssql_next_result(). + +2005-11-18 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + sapi/apache2handler/sapi_apache2.c: + MFH: Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). + +* sapi/apache2handler/sapi_apache2.c: + MFB51: Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php + module) + +* (PHP_5_1) + NEWS + sapi/apache2handler/sapi_apache2.c: + Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). + +2005-11-18 Jani Taskinen [EMAIL PROTECTED] + +* NEWS: + reorder + +2005-11-18 Rasmus Lerdorf [EMAIL PROTECTED] + +* NEWS: + allow_url_include + +* php.ini-dist + php.ini-recommended + main/main.c + main/php_globals.h + main/streams/streams.c: + Add allow_url_include to let people turn on allow_url_fopen without also + enabling remote code execution through url wrappers + +2005-11-18 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + INSTALL: + php4 - php5 + +* ext/readline/config.m4: + MFB51: fix build when --with-libedit is used + +* (PHP_4_4) + ext/readline/config.m4: + MF51: sync all changes + +* (PHP_5_1) + ext/readline/config.m4: + - Make sure --with-readline is used only when --with-libedit is not used. + +* (PHP_4_4) + NEWS: + fix news + +2005-11-18 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + configure.in + main/php_version.h: + - Back to -dev. + +2005-11-18 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS + NEWS: + Fixed bug #35273 (Error in mapping soap - java types) + +2005-11-18 Derick Rethans [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + configure.in + main/php_version.h: + - Go with 4.4.2RC1. + +2005-11-18 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_1) + configure.in + main/php_version.h: + back to dev + 2005-11-17 Marcus Boerger [EMAIL PROTECTED] * ext/standard/credits_ext.h: @@ -16691,7 +16829,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2168 2005/11/18 06:42:17 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2169 2005/11/19 06:52:43 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -20092,7 +20230,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2168 2005/11/18 06:42:17 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2169 2005/11/19 06:52:43 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -20573,7 +20711,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2168 2005/11/18 06:42:17 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2169 2005/11/19 06:52:43 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -22047,7 +22185,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2168 2005/11/18 06:42:17 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2169 2005/11/19 06:52:43 changelog Exp $ tag * ext/standard/credits_ext.h
Re: [PHP-CVS] cvs: php-src(PHP_5_1) /ext/reflection php_reflection_api.c php_reflection_api.h
Why not? IMO, it's the same if it's in 5.1 or HEAD, nothing changes but the location of the sources, right? It will be hell for you to merge fixes from HEAD now.. --Jani On Thu, 17 Nov 2005, Marcus Boerger wrote: helly Thu Nov 17 17:35:27 2005 EDT Removed files: (Branch: PHP_5_1) /php-src/ext/reflection php_reflection_api.c php_reflection_api.h Log: - Not in this branch -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
On Thu, 17 Nov 2005, Marcus Boerger wrote: helly Thu Nov 17 18:21:15 2005 EDT Modified files: /php-src/ext/reflection config.m4 Log: - Need to define HAVE_REFLECTION I think it should not be possible to disable this extension with a simple configure switch... 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_1) / configure.in /main php_version.h
sniper Fri Nov 18 04:51:44 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcconfigure.in /php-src/main php_version.h Log: back to dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.18r2=1.579.2.19ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.18 php-src/configure.in:1.579.2.19 --- php-src/configure.in:1.579.2.18 Thu Nov 17 16:27:56 2005 +++ php-src/configure.inFri Nov 18 04:51:39 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.18 2005/11/17 21:27:56 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.19 2005/11/18 09:51:39 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION=RC6 +EXTRA_VERSION=RC7-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.112.2.14r2=1.112.2.15ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.14 php-src/main/php_version.h:1.112.2.15 --- php-src/main/php_version.h:1.112.2.14 Thu Nov 17 16:27:58 2005 +++ php-src/main/php_version.h Fri Nov 18 04:51:44 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION RC6 -#define PHP_VERSION 5.1.0RC6 +#define PHP_EXTRA_VERSION RC7-dev +#define PHP_VERSION 5.1.0RC7-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS configure.in /main php_version.h
derick Fri Nov 18 05:30:46 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS configure.in /php-src/main php_version.h Log: - Go with 4.4.2RC1. http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.80r2=1.1247.2.920.2.81ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.80 php-src/NEWS:1.1247.2.920.2.81 --- php-src/NEWS:1.1247.2.920.2.80 Thu Nov 17 16:01:13 2005 +++ php-src/NEWSFri Nov 18 05:30:37 2005 @@ -1,6 +1,6 @@ PHP 4 NEWS ||| -?? ??? 2006, Version 4.4.2 +18 Nov 2005, Version 4.4.2RC1 - Resolve Apache 2 regression with sub-request handling on non-linux systems. (Ilia, Tony) - Backport missing imap_mailcompose fixes from 5.X. (Ilia) http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.164.2.14r2=1.396.2.164.2.15ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.14 php-src/configure.in:1.396.2.164.2.15 --- php-src/configure.in:1.396.2.164.2.14 Sun Oct 30 05:55:21 2005 +++ php-src/configure.inFri Nov 18 05:30:40 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.14 2005/10/30 10:55:21 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.15 2005/11/18 10:30:40 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=2 -EXTRA_VERSION=-dev +EXTRA_VERSION=RC1 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.81.2.11r2=1.66.2.81.2.12ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.11 php-src/main/php_version.h:1.66.2.81.2.12 --- php-src/main/php_version.h:1.66.2.81.2.11 Sun Oct 30 05:55:23 2005 +++ php-src/main/php_version.h Fri Nov 18 05:30:45 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 2 -#define PHP_EXTRA_VERSION -dev -#define PHP_VERSION 4.4.2-dev +#define PHP_EXTRA_VERSION RC1 +#define PHP_VERSION 4.4.2RC1 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_sdl.c /ext/soap/tests/bugs bug35273.phpt
dmitry Fri Nov 18 05:59:55 2005 EDT
Added files:
/php-src/ext/soap/tests/bugsbug35273.phpt
Modified files:
/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/ext/soap/php_sdl.c?r1=1.89r2=1.90ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.89 php-src/ext/soap/php_sdl.c:1.90
--- php-src/ext/soap/php_sdl.c:1.89 Mon Oct 24 03:43:48 2005
+++ php-src/ext/soap/php_sdl.c Fri Nov 18 05:59:51 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.89 2005/10/24 07:43:48 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.90 2005/11/18 10:59:51 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;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:echoPersonp
xsi:type=ns2:Personname xsi:type=SOAP-ENC:stringName/namesurname
xsi:type=SOAP-ENC:stringSurname/surname/p/ns1:echoPerson/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_1) / NEWS /ext/soap php_sdl.c /ext/soap/tests/bugs bug35273.phpt
dmitry Fri Nov 18 06:00:17 2005 EDT
Added files: (Branch: PHP_5_1)
/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.2027.2.201r2=1.2027.2.202ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.201 php-src/NEWS:1.2027.2.202
--- php-src/NEWS:1.2027.2.201 Thu Nov 17 16:15:19 2005
+++ php-src/NEWSFri Nov 18 06:00:14 2005
@@ -1,5 +1,8 @@
PHPNEWS
|||
+?? Nov 2005, PHP 5.1
+- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
+
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
and to emit an E_NOTICE on badly formed integer values. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/soap/php_sdl.c?r1=1.88.2.1r2=1.88.2.2ty=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.1 php-src/ext/soap/php_sdl.c:1.88.2.2
--- php-src/ext/soap/php_sdl.c:1.88.2.1 Mon Oct 24 03:44:17 2005
+++ php-src/ext/soap/php_sdl.c Fri Nov 18 06:00:15 2005
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.1 2005/10/24 07:44:17 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.2 2005/11/18 11:00:15 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/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_4_4) / NEWS configure.in /main php_version.h
derick Fri Nov 18 06:07:31 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcconfigure.in NEWS /php-src/main php_version.h Log: - Back to -dev. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.164.2.15r2=1.396.2.164.2.16ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.396.2.164.2.15 php-src/configure.in:1.396.2.164.2.16 --- php-src/configure.in:1.396.2.164.2.15 Fri Nov 18 05:30:40 2005 +++ php-src/configure.inFri Nov 18 06:07:25 2005 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.396.2.164.2.15 2005/11/18 10:30:40 derick Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.396.2.164.2.16 2005/11/18 11:07:25 derick Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -41,7 +41,7 @@ MAJOR_VERSION=4 MINOR_VERSION=4 RELEASE_VERSION=2 -EXTRA_VERSION=RC1 +EXTRA_VERSION=RC2-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/NEWS?r1=1.1247.2.920.2.81r2=1.1247.2.920.2.82ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.81 php-src/NEWS:1.1247.2.920.2.82 --- php-src/NEWS:1.1247.2.920.2.81 Fri Nov 18 05:30:37 2005 +++ php-src/NEWSFri Nov 18 06:07:26 2005 @@ -1,5 +1,8 @@ PHP 4 NEWS ||| +23 Nov 2005, Version 4.4.2 + + 18 Nov 2005, Version 4.4.2RC1 - Resolve Apache 2 regression with sub-request handling on non-linux systems. (Ilia, Tony) http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.66.2.81.2.12r2=1.66.2.81.2.13ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.66.2.81.2.12 php-src/main/php_version.h:1.66.2.81.2.13 --- php-src/main/php_version.h:1.66.2.81.2.12 Fri Nov 18 05:30:45 2005 +++ php-src/main/php_version.h Fri Nov 18 06:07:30 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 4 #define PHP_MINOR_VERSION 4 #define PHP_RELEASE_VERSION 2 -#define PHP_EXTRA_VERSION RC1 -#define PHP_VERSION 4.4.2RC1 +#define PHP_EXTRA_VERSION RC2-dev +#define PHP_VERSION 4.4.2RC2-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
On Fri, 18 Nov 2005, Derick Rethans wrote: On Thu, 17 Nov 2005, Marcus Boerger wrote: helly Thu Nov 17 18:21:15 2005 EDT Modified files: /php-src/ext/reflection config.m4 Log: - Need to define HAVE_REFLECTION I think it should not be possible to disable this extension with a simple configure switch... Why not? --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS
sniper Fri Nov 18 08:11:41 2005 EDT Modified files: (Branch: PHP_4_4) /php-srcNEWS Log: fix news http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.82r2=1.1247.2.920.2.83ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.920.2.82 php-src/NEWS:1.1247.2.920.2.83 --- php-src/NEWS:1.1247.2.920.2.82 Fri Nov 18 06:07:26 2005 +++ php-src/NEWSFri Nov 18 08:11:38 2005 @@ -4,10 +4,10 @@ 18 Nov 2005, Version 4.4.2RC1 -- Resolve Apache 2 regression with sub-request handling on non-linux systems. +- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia) +- Backported missing imap_mailcompose() fixes from PHP 5.x. (Ilia) +- Fixed Apache 2 regression with sub-request handling on non-linux systems. (Ilia, Tony) -- Backport missing imap_mailcompose fixes from 5.X. (Ilia) -- Added missing safe_mode/open_basedir checks in cURL extension. (Ilia) - Fixed bug #35257 (Calling ob_flush after creating an ob callback causes segfault). (Tony) - Fixed bug #35079 (stream_set_blocking(true) toggles, not enables -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
On 18.11.2005 16:08, Jani Taskinen wrote: On Fri, 18 Nov 2005, Derick Rethans wrote: On Thu, 17 Nov 2005, Marcus Boerger wrote: helly Thu Nov 17 18:21:15 2005 EDT Modified files: /php-src/ext/reflection config.m4 Log: - Need to define HAVE_REFLECTION I think it should not be possible to disable this extension with a simple configure switch... Why not? Not that I care, but if reflection could be disabled with --disable-all, FreeBSD users will never be able to use it, as for some reason which I can't understand, maintainer of PHP port uses --disable-all and builds all extensions as separate packages. I'm sure also there are a lot of others who use --disable-all and enable only what they consider useful. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
On Fri, 18 Nov 2005, Antony Dovgal wrote: On 18.11.2005 16:08, Jani Taskinen wrote: On Fri, 18 Nov 2005, Derick Rethans wrote: On Thu, 17 Nov 2005, Marcus Boerger wrote: helly Thu Nov 17 18:21:15 2005 EDT Modified files: /php-src/ext/reflection config.m4 Log: - Need to define HAVE_REFLECTION I think it should not be possible to disable this extension with a simple configure switch... Why not? Not that I care, but if reflection could be disabled with --disable-all, FreeBSD users will never be able to use it, as for some reason which I can't understand, maintainer of PHP port uses --disable-all and builds all extensions as separate packages. I'm sure also there are a lot of others who use --disable-all and enable only what they consider useful. That's the point of --disable-all and moving this thing to be an extension was just to make it less broken. --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_1) /ext/readline config.m4
sniper Fri Nov 18 10:07:45 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/readline config.m4 Log: - Make sure --with-readline is used only when --with-libedit is not used. http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.25r2=1.25.2.1ty=u Index: php-src/ext/readline/config.m4 diff -u php-src/ext/readline/config.m4:1.25 php-src/ext/readline/config.m4:1.25.2.1 --- php-src/ext/readline/config.m4:1.25 Sun May 29 19:16:44 2005 +++ php-src/ext/readline/config.m4 Fri Nov 18 10:07:39 2005 @@ -1,12 +1,14 @@ dnl -dnl $Id: config.m4,v 1.25 2005/05/29 23:16:44 sniper Exp $ +dnl $Id: config.m4,v 1.25.2.1 2005/11/18 15:07:39 sniper Exp $ dnl PHP_ARG_WITH(libedit,for libedit readline replacement, [ --with-libedit[=DIR]Include libedit readline replacement (CLI/CGI only)]) -PHP_ARG_WITH(readline,for readline support, -[ --with-readline[=DIR] Include readline support (CLI/CGI only)]) +if test $PHP_LIBEDIT = no; then + PHP_ARG_WITH(readline,for readline support, + [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) +fi if test $PHP_READLINE != no; then for i in $PHP_READLINE /usr/local /usr; do -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
On Fri, 18 Nov 2005, Antony Dovgal wrote: Not that I care, but if reflection could be disabled with --disable-all, FreeBSD users will never be able to use it, as for some reason which I can't understand, maintainer of PHP port uses --disable-all and builds all extensions as separate packages. If distributions screw up their packaging it is their fault - not ours. Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/readline config.m4
sniper Fri Nov 18 10:10:34 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/ext/readline config.m4 Log: MF51: sync all changes http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.17.4.3r2=1.17.4.3.4.1ty=u Index: php-src/ext/readline/config.m4 diff -u php-src/ext/readline/config.m4:1.17.4.3 php-src/ext/readline/config.m4:1.17.4.3.4.1 --- php-src/ext/readline/config.m4:1.17.4.3 Tue Sep 30 22:54:04 2003 +++ php-src/ext/readline/config.m4 Fri Nov 18 10:10:33 2005 @@ -1,12 +1,14 @@ dnl -dnl $Id: config.m4,v 1.17.4.3 2003/10/01 02:54:04 sniper Exp $ +dnl $Id: config.m4,v 1.17.4.3.4.1 2005/11/18 15:10:33 sniper Exp $ dnl PHP_ARG_WITH(libedit,for libedit readline replacement, -[ --with-libedit[=DIR]Include libedit readline replacement (CLI/CGI only).]) +[ --with-libedit[=DIR]Include libedit readline replacement (CLI/CGI only)]) -PHP_ARG_WITH(readline,for readline support, -[ --with-readline[=DIR] Include readline support (CLI/CGI only).]) +if test $PHP_LIBEDIT = no; then + PHP_ARG_WITH(readline,for readline support, + [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) +fi if test $PHP_READLINE != no; then for i in $PHP_READLINE /usr/local /usr; do @@ -19,13 +21,16 @@ PHP_ADD_INCLUDE($READLINE_DIR/include) + PHP_READLINE_LIBS= AC_CHECK_LIB(ncurses, tgetent, [ PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD) +PHP_READLINE_LIBS=$PHP_READLINE_LIBS -lncurses ],[ AC_CHECK_LIB(termcap, tgetent, [ PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD) + PHP_READLINE_LIBS=$PHP_READLINE_LIBS -ltermcap ]) ]) @@ -35,7 +40,14 @@ ], [ AC_MSG_ERROR(readline library not found) ], [ --L$READLINE_DIR/lib +-L$READLINE_DIR/lib $PHP_READLINE_LIBS + ]) + + PHP_CHECK_LIBRARY(readline, rl_callback_read_char, + [ +AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) + ],[],[ +-L$READLINE_DIR/lib $PHP_READLINE_LIBS ]) PHP_CHECK_LIBRARY(history, add_history, @@ -44,7 +56,7 @@ ], [ AC_MSG_ERROR(history library required by readline not found) ], [ --L$READLINE_DIR/lib +-L$READLINE_DIR/lib $PHP_READLINE_LIBS ]) PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/readline config.m4
sniper Fri Nov 18 10:11:14 2005 EDT Modified files: /php-src/ext/readline config.m4 Log: MFB51: fix build when --with-libedit is used http://cvs.php.net/diff.php/php-src/ext/readline/config.m4?r1=1.25r2=1.26ty=u Index: php-src/ext/readline/config.m4 diff -u php-src/ext/readline/config.m4:1.25 php-src/ext/readline/config.m4:1.26 --- php-src/ext/readline/config.m4:1.25 Sun May 29 19:16:44 2005 +++ php-src/ext/readline/config.m4 Fri Nov 18 10:11:14 2005 @@ -1,12 +1,14 @@ dnl -dnl $Id: config.m4,v 1.25 2005/05/29 23:16:44 sniper Exp $ +dnl $Id: config.m4,v 1.26 2005/11/18 15:11:14 sniper Exp $ dnl PHP_ARG_WITH(libedit,for libedit readline replacement, [ --with-libedit[=DIR]Include libedit readline replacement (CLI/CGI only)]) -PHP_ARG_WITH(readline,for readline support, -[ --with-readline[=DIR] Include readline support (CLI/CGI only)]) +if test $PHP_LIBEDIT = no; then + PHP_ARG_WITH(readline,for readline support, + [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) +fi if test $PHP_READLINE != no; then for i in $PHP_READLINE /usr/local /usr; do -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
On 18.11.2005 18:03, Jani Taskinen wrote: Not that I care, but if reflection could be disabled with --disable-all, FreeBSD users will never be able to use it, as for some reason which I can't understand, maintainer of PHP port uses --disable-all and builds all extensions as separate packages. I'm sure also there are a lot of others who use --disable-all and enable only what they consider useful. That's the point of --disable-all and moving this thing to be an extension was just to make it less broken. Probably, I explained it not very good. ext/reflection cannot be built as shared and that'll prevent FreeBSD users to use it at all. That's why I don't like the idea of having such an easy way to disable it. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
On 18.11.2005 18:08, Derick Rethans wrote: On Fri, 18 Nov 2005, Antony Dovgal wrote: Not that I care, but if reflection could be disabled with --disable-all, FreeBSD users will never be able to use it, as for some reason which I can't understand, maintainer of PHP port uses --disable-all and builds all extensions as separate packages. If distributions screw up their packaging it is their fault - not ours. Exactly. But we can think of making PHP a bit harder to screw up, right? -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
On Fri, 18 Nov 2005, Antony Dovgal wrote: On 18.11.2005 18:08, Derick Rethans wrote: On Fri, 18 Nov 2005, Antony Dovgal wrote: Not that I care, but if reflection could be disabled with --disable-all, FreeBSD users will never be able to use it, as for some reason which I can't understand, maintainer of PHP port uses --disable-all and builds all extensions as separate packages. If distributions screw up their packaging it is their fault - not ours. Exactly. But we can think of making PHP a bit harder to screw up, right? --disable-all is not meant for distributions, but they are find to shoot themselves in the foot. I don't see why we should try to prevent that. There is no reason why a distribution should use --disable-all and then compile everything shared. There is no reason for that. 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 /ext/reflection config.m4
On Fri, 18 Nov 2005, Antony Dovgal wrote: We need at least document it or to add something like this: But then we need to do this for every configure option... as nobody really knows what they are doing anyway. 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 /ext/reflection config.m4
On Fri, 18 Nov 2005, Antony Dovgal wrote: On 18.11.2005 18:03, Jani Taskinen wrote: Not that I care, but if reflection could be disabled with --disable-all, FreeBSD users will never be able to use it, as for some reason which I can't understand, maintainer of PHP port uses --disable-all and builds all extensions as separate packages. I'm sure also there are a lot of others who use --disable-all and enable only what they consider useful. That's the point of --disable-all and moving this thing to be an extension was just to make it less broken. Probably, I explained it not very good. ext/reflection cannot be built as shared and that'll prevent FreeBSD users to use it at all. Doing '--enable-reflection' is not possible on FreeBSD? And that's our problem, because..? --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
There's no point in putting any more notes in the configure help. I've seen how many people read them for real already. None. --Jani On Fri, 18 Nov 2005, Antony Dovgal wrote: On 18.11.2005 18:25, Derick Rethans wrote: On Fri, 18 Nov 2005, Antony Dovgal wrote: On 18.11.2005 18:08, Derick Rethans wrote: On Fri, 18 Nov 2005, Antony Dovgal wrote: Not that I care, but if reflection could be disabled with --disable-all, FreeBSD users will never be able to use it, as for some reason which I can't understand, maintainer of PHP port uses --disable-all and builds all extensions as separate packages. If distributions screw up their packaging it is their fault - not ours. Exactly. But we can think of making PHP a bit harder to screw up, right? --disable-all is not meant for distributions, but they are find to shoot themselves in the foot. I don't see why we should try to prevent that. There is no reason why a distribution should use --disable-all and then compile everything shared. There is no reason for that. I do know that. But *maintainers* often don't. We need at least document it or to add something like this: Index: configure.in === RCS file: /repository/php-src/configure.in,v retrieving revision 1.579.2.18 diff -u -p -d -r1.579.2.18 configure.in --- configure.in17 Nov 2005 21:27:56 - 1.579.2.18 +++ configure.in18 Nov 2005 15:36:43 - @@ -790,7 +790,10 @@ dnl Check if all enabled by default exte dnl AC_ARG_ENABLE(all, -[ --disable-all Disable all extensions which are enabled by default +[ --disable-all Disable all extensions which are enabled by default. + ONLY DO THAT IF KNOW WHAT YOU'RE DOING! + All default extensions have a good reason to be + enabled by default! ], [ PHP_ENABLE_ALL=$enableval ]) -- Give me your money at @ http://pecl.php.net/wishlist.php/sniper Donating money may make me happier and friendlier for a limited period! Death to all 4 letter abbreviations starting with 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_1) / INSTALL
sniper Fri Nov 18 11:09:51 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcINSTALL Log: php4 - php5 http://cvs.php.net/diff.php/php-src/INSTALL?r1=1.37r2=1.37.2.1ty=u Index: php-src/INSTALL diff -u php-src/INSTALL:1.37 php-src/INSTALL:1.37.2.1 --- php-src/INSTALL:1.37Wed Mar 30 08:15:05 2005 +++ php-src/INSTALL Fri Nov 18 11:09:50 2005 @@ -262,8 +262,8 @@ 10. cd ../apache_1.3.x -11. ./configure --prefix=/www --activate-module=src/modules/php4/libphp4.a -(The above line is correct! Yes, we know libphp4.a does not exist at this +11. ./configure --prefix=/www --activate-module=src/modules/php5/libphp5.a +(The above line is correct! Yes, we know libphp5.a does not exist at this stage. It isn't supposed to. It will be created.) 12. make @@ -309,24 +309,24 @@ ./configure --with-apxs --with-pgsql - This will create a libphp4.so shared library that is loaded into + This will create a libphp5.so shared library that is loaded into Apache using a LoadModule line in Apache's httpd.conf file. The - PostgreSQL support is embedded into this libphp4.so library. + PostgreSQL support is embedded into this libphp5.so library. ./configure --with-apxs --with-pgsql=shared - This will create a libphp4.so shared library for Apache, but it will + This will create a libphp5.so shared library for Apache, but it will also create a pgsql.so shared library that is loaded into PHP either by using the extension directive in php.ini file or by loading it explicitly in a script using the dl() function. ./configure --with-apache=/path/to/apache_source --with-pgsql - This will create a libmodphp4.a library, a mod_php4.c and some - accompanying files and copy this into the src/modules/php4 directory + This will create a libmodphp5.a library, a mod_php5.c and some + accompanying files and copy this into the src/modules/php5 directory in the Apache source tree. Then you compile Apache using - --activate-module=src/modules/php4/libphp4.a and the Apache build - system will create libphp4.a and link it statically into the httpd + --activate-module=src/modules/php5/libphp5.a and the Apache build + system will create libphp5.a and link it statically into the httpd binary. The PostgreSQL support is included directly into this httpd binary, so the final result here is a single httpd binary that includes all of Apache and all of PHP. @@ -380,8 +380,8 @@ * PHP 4.3.0 or later available at http://www.php.net/downloads.php. * the latest stable development version. Get the source code - http://snaps.php.net/php4-latest.tar.gz or download binaries for - Windows http://snaps.php.net/win32/php4-win32-latest.zip. + http://snaps.php.net/php5-latest.tar.gz or download binaries for + Windows http://snaps.php.net/win32/php5-win32-latest.zip. * a prerelease version downloadable from http://qa.php.net/. * you have always the option to obtain PHP through anonymous CVS. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / php.ini-dist php.ini-recommended /main main.c php_globals.h /main/streams streams.c
rasmus Fri Nov 18 11:20:43 2005 EDT
Modified files:
/php-srcphp.ini-dist php.ini-recommended
/php-src/main main.c php_globals.h
/php-src/main/streams streams.c
Log:
Add allow_url_include to let people turn on allow_url_fopen without also
enabling remote code execution through url wrappers
http://cvs.php.net/diff.php/php-src/php.ini-dist?r1=1.237r2=1.238ty=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.237 php-src/php.ini-dist:1.238
--- php-src/php.ini-dist:1.237 Mon Nov 14 18:14:54 2005
+++ php-src/php.ini-distFri Nov 18 11:20:41 2005
@@ -529,6 +529,8 @@
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
allow_url_fopen = On
+; Whether to allow code execution through URL wrappers
+allow_url_include = Off
; Define the anonymous ftp password (your email address)
;from=[EMAIL PROTECTED]
http://cvs.php.net/diff.php/php-src/php.ini-recommended?r1=1.186r2=1.187ty=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.186 php-src/php.ini-recommended:1.187
--- php-src/php.ini-recommended:1.186 Mon Nov 14 18:14:54 2005
+++ php-src/php.ini-recommended Fri Nov 18 11:20:41 2005
@@ -586,6 +586,8 @@
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
allow_url_fopen = On
+; Whether to allow code execution through URL wrappers
+allow_url_include = Off
; Define the anonymous ftp password (your email address)
;from=[EMAIL PROTECTED]
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.651r2=1.652ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.651 php-src/main/main.c:1.652
--- php-src/main/main.c:1.651 Tue Nov 15 06:14:34 2005
+++ php-src/main/main.c Fri Nov 18 11:20:43 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.651 2005/11/15 11:14:34 dmitry Exp $ */
+/* $Id: main.c,v 1.652 2005/11/18 16:20:43 rasmus Exp $ */
/* {{{ includes
*/
@@ -439,6 +439,7 @@
PHP_INI_ENTRY(disable_classes,,
PHP_INI_SYSTEM, NULL)
STD_PHP_INI_BOOLEAN(allow_url_fopen, 1,
PHP_INI_SYSTEM, OnUpdateBool, allow_url_fopen,
php_core_globals, core_globals)
+ STD_PHP_INI_BOOLEAN(allow_url_include,0,
PHP_INI_SYSTEM, OnUpdateBool, allow_url_include,
php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN(always_populate_raw_post_data,0,
PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateBool,
always_populate_raw_post_data, php_core_globals,
core_globals)
#ifdef REALPATH_CACHE
STD_PHP_INI_ENTRY(realpath_cache_size, 16K, PHP_INI_SYSTEM,
OnUpdateLong, realpath_cache_size_limit, virtual_cwd_globals, cwd_globals)
http://cvs.php.net/diff.php/php-src/main/php_globals.h?r1=1.98r2=1.99ty=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.98 php-src/main/php_globals.h:1.99
--- php-src/main/php_globals.h:1.98 Wed Aug 3 10:08:33 2005
+++ php-src/main/php_globals.h Fri Nov 18 11:20:43 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_globals.h,v 1.98 2005/08/03 14:08:33 sniper Exp $ */
+/* $Id: php_globals.h,v 1.99 2005/11/18 16:20:43 rasmus Exp $ */
#ifndef PHP_GLOBALS_H
#define PHP_GLOBALS_H
@@ -150,6 +150,7 @@
char *disable_functions;
char *disable_classes;
+ zend_bool allow_url_include;
};
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.89r2=1.90ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.89 php-src/main/streams/streams.c:1.90
--- php-src/main/streams/streams.c:1.89 Wed Oct 5 17:46:28 2005
+++ php-src/main/streams/streams.c Fri Nov 18 11:20:43 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.89 2005/10/05 21:46:28 tony2001 Exp $ */
+/* $Id: streams.c,v 1.90 2005/11/18 16:20:43 rasmus Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -2205,7 +2205,7 @@
return php_plain_files_wrapper;
}
- if (wrapper wrapper-is_url !PG(allow_url_fopen)) {
+ if ((wrapper wrapper-is_url) (!PG(allow_url_fopen) || (options
STREAM_OPEN_FOR_INCLUDE) !PG(allow_url_include)) ) {
if (options REPORT_ERRORS) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, URL
file-access is disabled in the server configuration);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
sniper Fri Nov 18 11:41:50 2005 EDT Modified files: /php-srcNEWS Log: reorder http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2078r2=1.2079ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2078 php-src/NEWS:1.2079 --- php-src/NEWS:1.2078 Fri Nov 18 11:28:01 2005 +++ php-src/NEWSFri Nov 18 11:41:49 2005 @@ -8,6 +8,8 @@ (Marcus, Dmitry) - Changed instanceof and catch operators, is_a() and is_subclass_of() functions to not call __autoload(). (Dmitry) +- Added allow_url_include ini directive to be able to turn off remote url + code execution separately from the allow_url_fopen setting. (Rasmus) - Added --enable-gcov configure option to enable C-level code coverage. (John, Jani) - Added to cURL extension: (Ilia) @@ -24,5 +26,3 @@ - Added possibility to check in which extension an internal function was defined using reflection API. (Johannes) - Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus) -- Add allow_url_include ini directive to be able to turn off remote url - code execution separately from the allow_url_fopen setting. (Rasmus) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /sapi/apache2handler sapi_apache2.c
iliaa Fri Nov 18 13:59:51 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/sapi/apache2handlersapi_apache2.c
Log:
Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.202r2=1.2027.2.203ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.202 php-src/NEWS:1.2027.2.203
--- php-src/NEWS:1.2027.2.202 Fri Nov 18 06:00:14 2005
+++ php-src/NEWSFri Nov 18 13:59:46 2005
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? Nov 2005, PHP 5.1
+- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
17 Nov 2005, PHP 5.1 Release Candidate 6
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.6r2=1.57.2.7ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.6
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.7
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.6 Thu Nov 17 16:00:28 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Nov 18 13:59:49 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.6 2005/11/17 21:00:28 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.7 2005/11/18 18:59:49 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -443,6 +443,18 @@
php_request_shutdown(NULL);
}
+static void php_apache_ini_dtor(request_rec *r, request_rec *p TSRMLS_DC)
+{
+ if (strcmp(r-protocol, INCLUDED)) {
+ zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();
+ }
+ if (p) {
+ ((php_struct *)SG(server_context))-r = p;
+ } else {
+ apr_pool_cleanup_run(r-pool, (void *)SG(server_context),
php_server_context_cleanup);
+ }
+}
+
static int php_handler(request_rec *r)
{
php_struct *ctx;
@@ -453,11 +465,7 @@
request_rec *parent_req = NULL;
TSRMLS_FETCH();
-#define PHPAP_INI_OFF \
- if (strcmp(r-protocol, INCLUDED)) { \
- zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
- } \
- apr_pool_cleanup_run(r-pool, (void *)SG(server_context),
php_server_context_cleanup); \
+#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
conf = ap_get_module_config(r-per_dir_config, php5_module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/apache2handler sapi_apache2.c
iliaa Fri Nov 18 14:01:50 2005 EDT
Modified files:
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFB51: Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.63r2=1.64ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.63
php-src/sapi/apache2handler/sapi_apache2.c:1.64
--- php-src/sapi/apache2handler/sapi_apache2.c:1.63 Thu Nov 17 15:56:09 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Nov 18 14:01:50 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.63 2005/11/17 20:56:09 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.64 2005/11/18 19:01:50 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -443,6 +443,18 @@
php_request_shutdown(NULL);
}
+static void php_apache_ini_dtor(request_rec *r, request_rec *p TSRMLS_DC)
+{
+ if (strcmp(r-protocol, INCLUDED)) {
+ zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();
+ }
+ if (p) {
+ ((php_struct *)SG(server_context))-r = p;
+ } else {
+ apr_pool_cleanup_run(r-pool, (void *)SG(server_context),
php_server_context_cleanup);
+ }
+}
+
static int php_handler(request_rec *r)
{
php_struct *ctx;
@@ -453,11 +465,7 @@
request_rec *parent_req = NULL;
TSRMLS_FETCH();
-#define PHPAP_INI_OFF \
- if (strcmp(r-protocol, INCLUDED)) { \
- zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
- } \
- apr_pool_cleanup_run(r-pool, (void *)SG(server_context),
php_server_context_cleanup); \
+#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
conf = ap_get_module_config(r-per_dir_config, php5_module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /sapi/apache2handler sapi_apache2.c
iliaa Fri Nov 18 14:03:14 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-srcNEWS
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH: Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.83r2=1.1247.2.920.2.84ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.83 php-src/NEWS:1.1247.2.920.2.84
--- php-src/NEWS:1.1247.2.920.2.83 Fri Nov 18 08:11:38 2005
+++ php-src/NEWSFri Nov 18 14:03:09 2005
@@ -1,7 +1,7 @@
PHP 4 NEWS
|||
23 Nov 2005, Version 4.4.2
-
+- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.40.2.7r2=1.1.2.40.2.8ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.7
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.8
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.7 Thu Nov 17
16:01:13 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Nov 18 14:03:13 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.40.2.7 2005/11/17 21:01:13 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40.2.8 2005/11/18 19:03:13 iliaa Exp $ */
#include fcntl.h
@@ -443,6 +443,18 @@
php_request_shutdown(NULL);
}
+static void php_apache_ini_dtor(request_rec *r, request_rec *p TSRMLS_DC)
+{
+ if (strcmp(r-protocol, INCLUDED)) {
+ zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try();
+ }
+ if (p) {
+ ((php_struct *)SG(server_context))-r = p;
+ } else {
+ apr_pool_cleanup_run(r-pool, (void *)SG(server_context),
php_server_context_cleanup);
+ }
+}
+
static int php_handler(request_rec *r)
{
php_struct *ctx;
@@ -453,11 +465,7 @@
request_rec *parent_req = NULL;
TSRMLS_FETCH();
-#define PHPAP_INI_OFF \
- if (strcmp(r-protocol, INCLUDED)) { \
- zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
- } \
- apr_pool_cleanup_run(r-pool, (void *)SG(server_context),
php_server_context_cleanup); \
+#define PHPAP_INI_OFF php_apache_ini_dtor(r, parent_req TSRMLS_CC);
conf = ap_get_module_config(r-per_dir_config, php4_module);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 14:13:36 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #33153 Crash in mssql_next_result().
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2079r2=1.2080ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2079 php-src/NEWS:1.2080
--- php-src/NEWS:1.2079 Fri Nov 18 11:41:49 2005
+++ php-src/NEWSFri Nov 18 14:13:34 2005
@@ -26,3 +26,4 @@
- Added possibility to check in which extension an internal function was
defined using reflection API. (Johannes)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.155r2=1.156ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.155 php-src/ext/mssql/php_mssql.c:1.156
--- php-src/ext/mssql/php_mssql.c:1.155 Mon Nov 14 18:14:54 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:13:35 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.155 2005/11/14 23:14:54 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.156 2005/11/18 19:13:35 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1865,6 +1865,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
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 14:14:33 2005 EDT
Modified files: (Branch: PHP_5_1)
/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.2027.2.203r2=1.2027.2.204ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.203 php-src/NEWS:1.2027.2.204
--- php-src/NEWS:1.2027.2.203 Fri Nov 18 13:59:46 2005
+++ php-src/NEWSFri Nov 18 14:14:31 2005
@@ -3,6 +3,7 @@
?? Nov 2005, PHP 5.1
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.4r2=1.152.2.5ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.4
php-src/ext/mssql/php_mssql.c:1.152.2.5
--- php-src/ext/mssql/php_mssql.c:1.152.2.4 Mon Nov 14 18:14:25 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:14:32 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.4 2005/11/14 23:14:25 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.5 2005/11/18 19:14:32 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1865,6 +1865,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
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 14:15:14 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.1247.2.920.2.84r2=1.1247.2.920.2.85ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.84 php-src/NEWS:1.1247.2.920.2.85
--- php-src/NEWS:1.1247.2.920.2.84 Fri Nov 18 14:03:09 2005
+++ php-src/NEWSFri Nov 18 14:15:11 2005
@@ -2,6 +2,7 @@
|||
23 Nov 2005, Version 4.4.2
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.4r2=1.86.2.44.2.5ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.4
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.5
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.4 Tue Nov 15 12:33:07 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:15:12 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.4 2005/11/15 17:33:07 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.5 2005/11/18 19:15:12 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1874,6 +1874,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_1) / NEWS /ext/mssql php_mssql.c
Please, MFH to PHP_5_0 too.
Thanks in advance.
On 18.11.2005 22:14, Frank M. Kromann wrote:
fmk Fri Nov 18 14:14:33 2005 EDT
Modified files: (Branch: PHP_5_1)
/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.2027.2.203r2=1.2027.2.204ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.203 php-src/NEWS:1.2027.2.204
--- php-src/NEWS:1.2027.2.203 Fri Nov 18 13:59:46 2005
+++ php-src/NEWSFri Nov 18 14:14:31 2005
@@ -3,6 +3,7 @@
?? Nov 2005, PHP 5.1
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
+- Fixed bug #33153 (crash in mssql_next result). (Frank)
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.4r2=1.152.2.5ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.4
php-src/ext/mssql/php_mssql.c:1.152.2.5
--- php-src/ext/mssql/php_mssql.c:1.152.2.4 Mon Nov 14 18:14:25 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 14:14:32 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.4 2005/11/14 23:14:25 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.5 2005/11/18 19:14:32 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1865,6 +1865,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 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
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / INSTALL
Please don't touch in the INSTALL and win32/install.txt files directly, because they are created automatically from the phpdoc files (make install-unix.txt make install-win.txt) Thanks, Nuno - Original Message - sniper Fri Nov 18 11:09:51 2005 EDT Modified files: (Branch: PHP_5_1) /php-src INSTALL Log: php4 - php5 http://cvs.php.net/diff.php/php-src/INSTALL?r1=1.37r2=1.37.2.1ty=u Index: php-src/INSTALL diff -u php-src/INSTALL:1.37 php-src/INSTALL:1.37.2.1 --- php-src/INSTALL:1.37 Wed Mar 30 08:15:05 2005 +++ php-src/INSTALL Fri Nov 18 11:09:50 2005 @@ -262,8 +262,8 @@ 10. cd ../apache_1.3.x -11. ./configure --prefix=/www --activate-module=src/modules/php4/libphp4.a -(The above line is correct! Yes, we know libphp4.a does not exist at this +11. ./configure --prefix=/www --activate-module=src/modules/php5/libphp5.a +(The above line is correct! Yes, we know libphp5.a does not exist at this stage. It isn't supposed to. It will be created.) 12. make @@ -309,24 +309,24 @@ ./configure --with-apxs --with-pgsql - This will create a libphp4.so shared library that is loaded into + This will create a libphp5.so shared library that is loaded into Apache using a LoadModule line in Apache's httpd.conf file. The - PostgreSQL support is embedded into this libphp4.so library. + PostgreSQL support is embedded into this libphp5.so library. ./configure --with-apxs --with-pgsql=shared - This will create a libphp4.so shared library for Apache, but it will + This will create a libphp5.so shared library for Apache, but it will also create a pgsql.so shared library that is loaded into PHP either by using the extension directive in php.ini file or by loading it explicitly in a script using the dl() function. ./configure --with-apache=/path/to/apache_source --with-pgsql - This will create a libmodphp4.a library, a mod_php4.c and some - accompanying files and copy this into the src/modules/php4 directory + This will create a libmodphp5.a library, a mod_php5.c and some + accompanying files and copy this into the src/modules/php5 directory in the Apache source tree. Then you compile Apache using - --activate-module=src/modules/php4/libphp4.a and the Apache build - system will create libphp4.a and link it statically into the httpd + --activate-module=src/modules/php5/libphp5.a and the Apache build + system will create libphp5.a and link it statically into the httpd binary. The PostgreSQL support is included directly into this httpd binary, so the final result here is a single httpd binary that includes all of Apache and all of PHP. @@ -380,8 +380,8 @@ * PHP 4.3.0 or later available at http://www.php.net/downloads.php. * the latest stable development version. Get the source code - http://snaps.php.net/php4-latest.tar.gz or download binaries for - Windows http://snaps.php.net/win32/php4-win32-latest.zip. + http://snaps.php.net/php5-latest.tar.gz or download binaries for + Windows http://snaps.php.net/win32/php5-win32-latest.zip. * a prerelease version downloadable from http://qa.php.net/. * you have always the option to obtain PHP through anonymous CVS. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:40:28 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #32009 crash when mssql_bind() is called more than once
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2080r2=1.2081ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2080 php-src/NEWS:1.2081
--- php-src/NEWS:1.2080 Fri Nov 18 14:13:34 2005
+++ php-src/NEWSFri Nov 18 15:40:19 2005
@@ -27,3 +27,4 @@
defined using reflection API. (Johannes)
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.156r2=1.157ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.156 php-src/ext/mssql/php_mssql.c:1.157
--- php-src/ext/mssql/php_mssql.c:1.156 Fri Nov 18 14:13:35 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:40:28 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.156 2005/11/18 19:13:35 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.157 2005/11/18 20:40:28 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2114,17 +2114,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_1) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:40:53 2005 EDT
Modified files: (Branch: PHP_5_1)
/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.2027.2.204r2=1.2027.2.205ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.204 php-src/NEWS:1.2027.2.205
--- php-src/NEWS:1.2027.2.204 Fri Nov 18 14:14:31 2005
+++ php-src/NEWSFri Nov 18 15:40:51 2005
@@ -4,6 +4,7 @@
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #35273 (Error in mapping soap - java types). (Dmitry)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.5r2=1.152.2.6ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.5
php-src/ext/mssql/php_mssql.c:1.152.2.6
--- php-src/ext/mssql/php_mssql.c:1.152.2.5 Fri Nov 18 14:14:32 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:40:52 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.5 2005/11/18 19:14:32 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.6 2005/11/18 20:40:52 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2116,17 +2116,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: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_4_4) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:41:52 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.1247.2.920.2.85r2=1.1247.2.920.2.86ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.85 php-src/NEWS:1.1247.2.920.2.86
--- php-src/NEWS:1.1247.2.920.2.85 Fri Nov 18 14:15:11 2005
+++ php-src/NEWSFri Nov 18 15:41:49 2005
@@ -3,6 +3,7 @@
23 Nov 2005, Version 4.4.2
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (Ilia)
- Fixed bug #33153 (crash in mssql_next result). (Frank)
+- Fixed bug #32009 (crash when mssql_bind() is called more than once). (Frank)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.5r2=1.86.2.44.2.6ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.5
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.6
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.5 Fri Nov 18 14:15:12 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:41:51 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.5 2005/11/18 19:15:12 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.6 2005/11/18 20:41:51 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2130,17 +2130,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 / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:48:23 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #33963. mssql_bind fails on input parameters
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2081r2=1.2082ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2081 php-src/NEWS:1.2082
--- php-src/NEWS:1.2081 Fri Nov 18 15:40:19 2005
+++ php-src/NEWSFri Nov 18 15:48:19 2005
@@ -28,3 +28,4 @@
- Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus)
- 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)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.157r2=1.158ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.157 php-src/ext/mssql/php_mssql.c:1.158
--- php-src/ext/mssql/php_mssql.c:1.157 Fri Nov 18 15:40:28 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:48:22 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.157 2005/11/18 20:40:28 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.158 2005/11/18 20:48:22 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2041,7 +2041,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_1) / NEWS
fmk Fri Nov 18 15:48:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: MFH Fix #33963. mssql_bind fails on input parameters http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.205r2=1.2027.2.206ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.205 php-src/NEWS:1.2027.2.206 --- php-src/NEWS:1.2027.2.205 Fri Nov 18 15:40:51 2005 +++ php-src/NEWSFri Nov 18 15:48:46 2005 @@ -5,6 +5,7 @@ - Fixed bug #35273 (Error in mapping soap - java types). (Dmitry) - 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) 17 Nov 2005, PHP 5.1 Release Candidate 6 - Changed function parameter parsing to handle integers in a non-strict fashion -- 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_4_4) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 15:49:18 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.1247.2.920.2.86r2=1.1247.2.920.2.87ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.86 php-src/NEWS:1.1247.2.920.2.87
--- php-src/NEWS:1.1247.2.920.2.86 Fri Nov 18 15:41:49 2005
+++ php-src/NEWSFri Nov 18 15:49:15 2005
@@ -4,6 +4,7 @@
- Fixed bug #35278 (Multiple virtual() calls crash Apache 2 php module). (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)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.6r2=1.86.2.44.2.7ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.6
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.7
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.6 Fri Nov 18 15:41:51 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 15:49:16 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.6 2005/11/18 20:41:51 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.7 2005/11/18 20:49:16 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -2057,7 +2057,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
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
Frank, you committed only NEWS file in 5.1 branch. On 18.11.2005 23:48, Frank M. Kromann wrote: fmk Fri Nov 18 15:48:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-src NEWS Log: MFH Fix #33963. mssql_bind fails on input parameters http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.205r2=1.2027.2.206ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.205 php-src/NEWS:1.2027.2.206 --- php-src/NEWS:1.2027.2.205 Fri Nov 18 15:40:51 2005 +++ php-src/NEWSFri Nov 18 15:48:46 2005 @@ -5,6 +5,7 @@ - Fixed bug #35273 (Error in mapping soap - java types). (Dmitry) - 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) 17 Nov 2005, PHP 5.1 Release Candidate 6 - Changed function parameter parsing to handle integers in a non-strict fashion -- 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 / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 16:22:51 2005 EDT
Modified files:
/php-srcNEWS
/php-src/ext/mssql php_mssql.c
Log:
Fix #33201 Crash when fetching some data types
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2082r2=1.2083ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2082 php-src/NEWS:1.2083
--- php-src/NEWS:1.2082 Fri Nov 18 15:48:19 2005
+++ php-src/NEWSFri Nov 18 16:22:40 2005
@@ -29,3 +29,4 @@
- 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)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.158r2=1.159ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.158 php-src/ext/mssql/php_mssql.c:1.159
--- php-src/ext/mssql/php_mssql.c:1.158 Fri Nov 18 15:48:22 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:22:50 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.158 2005/11/18 20:48:22 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.159 2005/11/18 21:22:50 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -891,11 +891,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 :
@@ -903,6 +901,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -961,11 +961,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 :
@@ -973,6 +971,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_1) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 16:23:21 2005 EDT
Modified files: (Branch: PHP_5_1)
/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.2027.2.206r2=1.2027.2.207ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.206 php-src/NEWS:1.2027.2.207
--- php-src/NEWS:1.2027.2.206 Fri Nov 18 15:48:46 2005
+++ php-src/NEWSFri Nov 18 16:23:19 2005
@@ -6,6 +6,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)
17 Nov 2005, PHP 5.1 Release Candidate 6
- Changed function parameter parsing to handle integers in a non-strict fashion
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.152.2.6r2=1.152.2.7ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.6
php-src/ext/mssql/php_mssql.c:1.152.2.7
--- php-src/ext/mssql/php_mssql.c:1.152.2.6 Fri Nov 18 15:40:52 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:23:20 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.152.2.6 2005/11/18 20:40:52 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.7 2005/11/18 21:23:20 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -891,11 +891,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 :
@@ -903,6 +901,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -961,11 +961,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 :
@@ -973,6 +971,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 /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_4_4) / NEWS /ext/mssql php_mssql.c
fmk Fri Nov 18 16:24:07 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.1247.2.920.2.87r2=1.1247.2.920.2.88ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.87 php-src/NEWS:1.1247.2.920.2.88
--- php-src/NEWS:1.1247.2.920.2.87 Fri Nov 18 15:49:15 2005
+++ php-src/NEWSFri Nov 18 16:24:05 2005
@@ -5,6 +5,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)
18 Nov 2005, Version 4.4.2RC1
- Added missing safe_mode/open_basedir checks into cURL extension. (Ilia)
http://cvs.php.net/diff.php/php-src/ext/mssql/php_mssql.c?r1=1.86.2.44.2.7r2=1.86.2.44.2.8ty=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.7
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.8
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.7 Fri Nov 18 15:49:16 2005
+++ php-src/ext/mssql/php_mssql.c Fri Nov 18 16:24:06 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mssql.c,v 1.86.2.44.2.7 2005/11/18 20:49:16 fmk Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.8 2005/11/18 21:24:06 fmk Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -891,11 +891,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 :
@@ -903,6 +901,8 @@
case SQLDECIMAL :
case SQLNUMERIC :
res_length += 5;
+ case 127 :
+ res_length += 20;
break;
}
@@ -965,11 +965,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 :
@@ -977,6 +975,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
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
The fix was already in the code. It was included in my previous commit. - Frank Frank, you committed only NEWS file in 5.1 branch. On 18.11.2005 23:48, Frank M. Kromann wrote: fmk Fri Nov 18 15:48:47 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: MFH Fix #33963. mssql_bind fails on input parameters http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.205r2=1.2027.2.206ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.205 php-src/NEWS:1.2027.2.206 --- php-src/NEWS:1.2027.2.205 Fri Nov 18 15:40:51 2005 +++ php-src/NEWSFri Nov 18 15:48:46 2005 @@ -5,6 +5,7 @@ - Fixed bug #35273 (Error in mapping soap - java types). (Dmitry) - 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) 17 Nov 2005, PHP 5.1 Release Candidate 6 - Changed function parameter parsing to handle integers in a non-strict fashion -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
Hello Derick, the other config options are not that dangerous. I'd say Jani should add that info. And maybe we should require =yes or =version so that ppl have to think about this switch before it works marcus Friday, November 18, 2005, 4:40:34 PM, you wrote: On Fri, 18 Nov 2005, Antony Dovgal wrote: We need at least document it or to add something like this: But then we need to do this for every configure option... as nobody really knows what they are doing anyway. Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
Hello Derick, any good ideas on the howto front? regards marcus Friday, November 18, 2005, 9:08:38 AM, you wrote: On Thu, 17 Nov 2005, Marcus Boerger wrote: helly Thu Nov 17 18:21:15 2005 EDT Modified files: /php-src/ext/reflection config.m4 Log: - Need to define HAVE_REFLECTION I think it should not be possible to disable this extension with a simple configure switch... Derick Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
helly Fri Nov 18 17:59:09 2005 EDT
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- Disabled globals code in a way that does not affect purist or old compilers
http://cvs.php.net/diff.php/php-src/ext/reflection/php_reflection.c?r1=1.190r2=1.191ty=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.190
php-src/ext/reflection/php_reflection.c:1.191
--- php-src/ext/reflection/php_reflection.c:1.190 Thu Nov 17 17:59:38 2005
+++ php-src/ext/reflection/php_reflection.c Fri Nov 18 17:59:07 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.190 2005/11/17 22:59:38 helly Exp $ */
+/* $Id: php_reflection.c,v 1.191 2005/11/18 22:59:07 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -50,7 +50,9 @@
PHPAPI zend_class_entry *reflection_property_ptr;
PHPAPI zend_class_entry *reflection_extension_ptr;
+#if MBO_0
ZEND_BEGIN_MODULE_GLOBALS(reflection)
+ int dummy;
ZEND_END_MODULE_GLOBALS(reflection)
#ifdef ZTS
@@ -62,11 +64,8 @@
extern zend_reflection_globals reflectionglobals;
#endif
-#ifdef COMPILE_DL_REFLECTION
-ZEND_GET_MODULE(reflection)
-#endif
-
ZEND_DECLARE_MODULE_GLOBALS(reflection)
+#endif /* MBO_0 */
/* Method macros */
@@ -4184,17 +4183,10 @@
}
/* }}} */
-static void reflection_init_globals(zend_reflection_globals *globals) /* {{{ */
-{
- /* Initialize your global struct */
-} /* }}} */
-
PHP_MINIT_FUNCTION(reflection) /* {{{ */
{
zend_class_entry _reflection_entry;
- ZEND_INIT_MODULE_GLOBALS(reflection, reflection_init_globals, NULL);
-
zend_std_obj_handlers = zend_get_std_object_handlers();
memcpy(reflection_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
reflection_object_handlers.clone_obj = NULL;
@@ -4278,7 +4270,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.190
2005/11/17 22:59:38 helly Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.191
2005/11/18 22:59:07 helly Exp $);
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection config.m4
As I mentioned to Marcus, it seems odd to me to move reflection in the first place. It seems to me to be very much a language feature and in my opinion, should always be enabled. I can't really see a good reason for this move. Andi At 07:40 AM 11/18/2005, Derick Rethans wrote: On Fri, 18 Nov 2005, Antony Dovgal wrote: We need at least document it or to add something like this: But then we need to do this for every configure option... as nobody really knows what they are doing anyway. 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 Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
hirokawaSat Nov 19 01:32:25 2005 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
fixed #35253 length of the encoded string vilolates a RFC.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.226r2=1.227ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.226
php-src/ext/mbstring/mbstring.c:1.227
--- php-src/ext/mbstring/mbstring.c:1.226 Wed Sep 21 09:23:12 2005
+++ php-src/ext/mbstring/mbstring.c Sat Nov 19 01:32:20 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.226 2005/09/21 13:23:12 iliaa Exp $ */
+/* $Id: mbstring.c,v 1.227 2005/11/19 06:32:20 hirokawa Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -2294,7 +2294,7 @@
}
/* }}} */
-/* {{{ proto string mb_encode_mimeheader(string str [, string charset [,
string transfer-encoding [, string linefeed]]])
+/* {{{ proto string mb_encode_mimeheader(string str [, string charset [,
string transfer-encoding [, string linefeed [, int indent)
Converts the string to MIME encoded-word in the format of
=?charset?(B|Q)?encoded_string?= */
PHP_FUNCTION(mb_encode_mimeheader)
{
@@ -2306,12 +2306,13 @@
int trans_enc_name_len;
char *linefeed = \r\n;
int linefeed_len;
+ int indent = 0;
mbfl_string_init(string);
string.no_language = MBSTRG(current_language);
string.no_encoding = MBSTRG(current_internal_encoding);
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|sss, (char
**)string.val, string.len, charset_name, charset_name_len, trans_enc_name,
trans_enc_name_len, linefeed, linefeed_len) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|sssl, (char
**)string.val, string.len, charset_name, charset_name_len, trans_enc_name,
trans_enc_name_len, linefeed, linefeed_len, indent) == FAILURE) {
return;
}
@@ -2341,7 +2342,7 @@
}
mbfl_string_init(result);
- ret = mbfl_mime_header_encode(string, result, charset, transenc,
linefeed, 0);
+ ret = mbfl_mime_header_encode(string, result, charset, transenc,
linefeed, indent);
if (ret != NULL) {
RETVAL_STRINGL((char *)ret-val, ret-len, 0) /* the string
is already strdup()'ed */
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c
hirokawaSat Nov 19 01:39:43 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/mbstring mbstring.c
Log:
MFH: fixed #35253 length of the encoded string vilolates a RFC.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.3r2=1.142.2.47.2.4ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.3
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.4
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.3 Fri Nov 4 20:14:05 2005
+++ php-src/ext/mbstring/mbstring.c Sat Nov 19 01:39:39 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.47.2.3 2005/11/05 01:14:05 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.4 2005/11/19 06:39:39 hirokawa Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -2924,16 +2924,17 @@
}
/* }}} */
-/* {{{ proto string mb_encode_mimeheader(string str [, string charset [,
string transfer-encoding [, string linefeed]]])
+/* {{{ proto string mb_encode_mimeheader(string str [, string charset [,
string transfer-encoding [, string linefeed [, int indent)
Converts the string to MIME encoded-word in the format of
=?charset?(B|Q)?encoded_string?= */
PHP_FUNCTION(mb_encode_mimeheader)
{
- pval **argv[4];
+ pval **argv[5];
enum mbfl_no_encoding charset, transenc;
mbfl_string string, result, *ret;
char *p, *linefeed;
+ int indent;
- if (ZEND_NUM_ARGS() 1 || ZEND_NUM_ARGS() 4 ||
zend_get_parameters_array_ex(ZEND_NUM_ARGS(), argv) == FAILURE) {
+ if (ZEND_NUM_ARGS() 1 || ZEND_NUM_ARGS() 5 ||
zend_get_parameters_array_ex(ZEND_NUM_ARGS(), argv) == FAILURE) {
WRONG_PARAM_COUNT;
}
@@ -2970,6 +2971,12 @@
linefeed = Z_STRVAL_PP(argv[3]);
}
+ indent = 0;
+ if (ZEND_NUM_ARGS() = 5) {
+ convert_to_long_ex(argv[4]);
+ indent = Z_LVAL_PP(argv[4]);
+ }
+
convert_to_string_ex(argv[0]);
mbfl_string_init(string);
mbfl_string_init(result);
@@ -2977,7 +2984,7 @@
string.no_encoding = MBSTRG(current_internal_encoding);
string.val = Z_STRVAL_PP(argv[0]);
string.len = Z_STRLEN_PP(argv[0]);
- ret = mbfl_mime_header_encode(string, result, charset, transenc,
linefeed, 0);
+ ret = mbfl_mime_header_encode(string, result, charset, transenc,
linefeed, indent);
if (ret != NULL) {
RETVAL_STRINGL((char *)ret-val, ret-len, 0) /* the string
is already strdup()'ed */
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
