[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu May 3 01:31:06 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2676r2=1.2677diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2676 php-src/ChangeLog:1.2677 --- php-src/ChangeLog:1.2676Wed May 2 01:31:02 2007 +++ php-src/ChangeLog Thu May 3 01:31:06 2007 @@ -1,3 +1,108 @@ +2007-05-02 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + configure.in + main/php_version.h: + + 5.2.2 + +2007-05-02 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ZendEngine2/zend_compile.c + ext/soap/php_encoding.c: + Reverted the following fixed because of php-5.2.2 release process + - Fixed altering $this via argument named this. + - Fixed bug #41097 (ext/soap returning associative array as indexed + without +using WSDL). + - Fixed bug #41004 (minOccurs=0 and null class member variable). + +2007-05-02 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/tests/bug40770.phpt: + add SKIPIF section + +* ZendEngine2/tests/bug40770.phpt: + this test is only valid when Zend MM is enabled + +* run-tests.php: + make USE_ZEND_ALLOC env var available in SKIPIF section + +2007-05-02 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/tests/bug41117_1.phpt + ZendEngine2/tests/bug41117_1.phpt: + + file bug41117_1.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + NEWS + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.c + ZendEngine2/tests/bug41117_1.phpt: + Fixed altering $this via argument named this + +2007-05-02 Antony Dovgal [EMAIL PROTECTED] + +* ext/session/php_session.h + ext/session/session.c: + fix build when ext/hash is compiled as shared module + +2007-05-02 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + win32/registry.c + win32/registry.c: + Fixed bug #41192 (Per Directory Values only work for one key) + +* ext/soap/tests/bugs/bug41004.phpt + ext/soap/tests/bugs/bug41004.phpt + ext/soap/tests/bugs/bug41004.wsdl + ext/soap/tests/bugs/bug41004.wsdl: + + file bug41004.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + NEWS + ext/soap/php_encoding.c + ext/soap/php_encoding.c + ext/soap/tests/bugs/bug41004.phpt + ext/soap/tests/bugs/bug41004.wsdl: + Fixed bug #41004 (minOccurs=0 and null class member variable) + +* ext/soap/tests/schema/schema085.phpt: + New test + +* ext/soap/tests/schema/schema085.phpt + ext/soap/tests/schema/schema085.phpt: + + file schema085.phpt was initially added on branch PHP_5_2. + +* ext/soap/tests/bugs/bug41097.phpt + ext/soap/tests/bugs/bug41097.phpt: + + file bug41097.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + NEWS + ext/soap/php_encoding.c + ext/soap/php_encoding.c + ext/soap/soap.c + ext/soap/soap.c + ext/soap/tests/bugs/bug41097.phpt + ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt: + Fixed bug #41097 (ext/soap returning associative array as indexed without + using WSDL) + +* ext/standard/tests/assert/assert02.phpt + ext/standard/tests/assert/assert02.phpt: + Fixed test + 2007-05-01 Ilia Alshanetsky [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu May 3 01:31:08 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1105r2=1.1106diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1105 ZendEngine2/ChangeLog:1.1106 --- ZendEngine2/ChangeLog:1.1105Tue May 1 01:31:03 2007 +++ ZendEngine2/ChangeLog Thu May 3 01:31:08 2007 @@ -1,3 +1,35 @@ +2007-05-02 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_2) + zend_compile.c: + Reverted the following fixed because of php-5.2.2 release process + - Fixed altering $this via argument named this. + - Fixed bug #41097 (ext/soap returning associative array as indexed + without +using WSDL). + - Fixed bug #41004 (minOccurs=0 and null class member variable). + +2007-05-02 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + tests/bug40770.phpt: + add SKIPIF section + +* tests/bug40770.phpt: + this test is only valid when Zend MM is enabled + +2007-05-02 Dmitry Stogov [EMAIL PROTECTED] + +* zend_compile.c + zend_compile.c + tests/bug41117_1.phpt: + Fixed altering $this via argument named this + +* tests/bug41117_1.phpt + tests/bug41117_1.phpt: + + file bug41117_1.phpt was initially added on branch PHP_5_2. + 2007-04-30 Johannes Schlüter [EMAIL PROTECTED] * (PHP_5_2) @@ -17589,7 +17621,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1105 2007/05/01 01:31:03 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1106 2007/05/03 01:31:08 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -19313,7 +19345,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1105 2007/05/01 01:31:03 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1106 2007/05/03 01:31:08 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/standard/tests/assert assert02.phpt
dmitry Wed May 2 07:27:52 2007 UTC Modified files: /php-src/ext/standard/tests/assert assert02.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/standard/tests/assert/assert02.phpt diff -u php-src/ext/standard/tests/assert/assert02.phpt:1.4 php-src/ext/standard/tests/assert/assert02.phpt:1.5 --- php-src/ext/standard/tests/assert/assert02.phpt:1.4 Mon Jul 3 22:41:46 2006 +++ php-src/ext/standard/tests/assert/assert02.phpt Wed May 2 07:27:52 2007 @@ -31,14 +31,14 @@ Parse error: %s error, unexpected '=' in %sassert02.php(14) : assert code on line 1 in handler() -string(61) assert(): Failure evaluating code: +string(%d) assert(): Failure evaluating code: aa=sd+as+safsafasfasafsaf Warning: assert(): Assertion 0 failed in %sassert02.php on line 16 Parse error: %s error, unexpected '=' in %sassert02.php(19) : assert code on line 1 in handler() -string(61) assert(): Failure evaluating code: +string(%d) assert(): Failure evaluating code: aa=sd+as+safsafasfasafsaf --UEXPECTF-- Notice: Undefined variable: a in %sassert02.php(12) : assert code on line 1 @@ -47,12 +47,12 @@ Parse error: %s error, unexpected '=' in %sassert02.php(14) : assert code on line 1 in handler() -unicode(61) assert(): Failure evaluating code: +unicode(%d) assert(): Failure evaluating code: aa=sd+as+safsafasfasafsaf Warning: assert(): Assertion 0 failed in %sassert02.php on line 16 Parse error: %s error, unexpected '=' in %sassert02.php(19) : assert code on line 1 in handler() -unicode(61) assert(): Failure evaluating code: +unicode(%d) assert(): Failure evaluating code: aa=sd+as+safsafasfasafsaf -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/assert assert02.phpt
dmitry Wed May 2 07:27:36 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/assert assert02.phpt Log: Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u Index: php-src/ext/standard/tests/assert/assert02.phpt diff -u php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.5 php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.6 --- php-src/ext/standard/tests/assert/assert02.phpt:1.1.2.5 Tue Jul 11 22:13:53 2006 +++ php-src/ext/standard/tests/assert/assert02.phpt Wed May 2 07:27:36 2007 @@ -31,12 +31,12 @@ Parse error: %s error%sassert02.php(%d) : assert code on line 1 in handler() -string(64) assert(): Failure evaluating code: +string(%d) assert(): Failure evaluating code: aa=sd+as+safsafasfaçsafçsafç Warning: assert(): Assertion 0 failed in %sassert02.php on line %d Parse error: %s error%sassert02.php(%d) : assert code on line 1 in handler() -string(64) assert(): Failure evaluating code: +string(%d) assert(): Failure evaluating code: aa=sd+as+safsafasfaçsafçsafç -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c soap.c /ext/soap/tests/bugs bug41097.phpt
dmitry Wed May 2 08:22:13 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug41097.phpt
Modified files:
/php-srcNEWS
/php-src/ext/soap php_encoding.c soap.c
Log:
Fixed bug #41097 (ext/soap returning associative array as indexed without
using WSDL)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.668r2=1.2027.2.547.2.669diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.668 php-src/NEWS:1.2027.2.547.2.669
--- php-src/NEWS:1.2027.2.547.2.668 Mon Apr 30 20:01:16 2007
+++ php-src/NEWSWed May 2 08:22:12 2007
@@ -3,6 +3,8 @@
?? Apr 2007, PHP 5.2.3RC3
- Fixed iterator_apply() with a callback using __call(). (Johannes)
- Fixed bug #41215 (setAttribute return code reversed). (Ilia)
+- Fixed bug #41097 (ext/soap returning associative array as indexed without
+ using WSDL). (Dmitry)
26 Apr 2007, PHP 5.2.2RC2
- Added GMP_VERSION constant. (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.29r2=1.103.2.21.2.30diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.29
php-src/ext/soap/php_encoding.c:1.103.2.21.2.30
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.29 Fri Apr 6 18:27:58 2007
+++ php-src/ext/soap/php_encoding.c Wed May 2 08:22:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.29 2007/04/06 18:27:58 andrei Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.30 2007/05/02 08:22:13 dmitry Exp $ */
#include time.h
@@ -3356,8 +3356,12 @@
int i, count = zend_hash_num_elements(Z_ARRVAL_P(array));
zend_hash_internal_pointer_reset(Z_ARRVAL_P(array));
- for (i = 0;i count;i++) {
- if (zend_hash_get_current_key_type(Z_ARRVAL_P(array)) ==
HASH_KEY_IS_STRING) {
+ for (i = 0; i count; i++) {
+ char *str_index;
+ ulong num_index;
+
+ if (zend_hash_get_current_key(Z_ARRVAL_P(array), str_index,
num_index, 0) == HASH_KEY_IS_STRING ||
+ num_index != i) {
return TRUE;
}
zend_hash_move_forward(Z_ARRVAL_P(array));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.22r2=1.156.2.28.2.23diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.22
php-src/ext/soap/soap.c:1.156.2.28.2.23
--- php-src/ext/soap/soap.c:1.156.2.28.2.22 Mon Apr 2 13:43:08 2007
+++ php-src/ext/soap/soap.c Wed May 2 08:22:13 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.156.2.28.2.22 2007/04/02 13:43:08 dmitry Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.23 2007/05/02 08:22:13 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -654,6 +654,8 @@
REGISTER_LONG_CONSTANT(XSD_ANYTYPE, XSD_ANYTYPE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(XSD_ANYXML, XSD_ANYXML, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(APACHE_MAP, APACHE_MAP, CONST_CS |
CONST_PERSISTENT);
+
REGISTER_LONG_CONSTANT(SOAP_ENC_OBJECT, SOAP_ENC_OBJECT, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SOAP_ENC_ARRAY, SOAP_ENC_ARRAY, CONST_CS |
CONST_PERSISTENT);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41097.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug41097.phpt
+++ php-src/ext/soap/tests/bugs/bug41097.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c soap.c /ext/soap/tests/bugs bug41097.phpt /ext/soap/tests/interop/Round3/GroupD r3_groupD_compound2_001w.phpt
dmitry Wed May 2 08:22:32 2007 UTC
Modified files:
/php-src/ext/soap php_encoding.c soap.c
/php-src/ext/soap/tests/bugsbug41097.phpt
/php-src/ext/soap/tests/interop/Round3/GroupD
r3_groupD_compound2_001w.phpt
Log:
Fixed bug #41097 (ext/soap returning associative array as indexed without
using WSDL)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.157r2=1.158diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.157
php-src/ext/soap/php_encoding.c:1.158
--- php-src/ext/soap/php_encoding.c:1.157 Mon Apr 2 13:43:29 2007
+++ php-src/ext/soap/php_encoding.c Wed May 2 08:22:32 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.157 2007/04/02 13:43:29 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.158 2007/05/02 08:22:32 dmitry Exp $ */
#include time.h
@@ -3345,8 +3345,12 @@
int i, count = zend_hash_num_elements(Z_ARRVAL_P(array));
zend_hash_internal_pointer_reset(Z_ARRVAL_P(array));
- for (i = 0;i count;i++) {
- if (zend_hash_get_current_key_type(Z_ARRVAL_P(array)) !=
HASH_KEY_IS_LONG) {
+ for (i = 0; i count; i++) {
+ zstr str_index;
+ ulong num_index;
+
+ if (zend_hash_get_current_key(Z_ARRVAL_P(array), str_index,
num_index, 0) != HASH_KEY_IS_LONG ||
+ num_index != i) {
return TRUE;
}
zend_hash_move_forward(Z_ARRVAL_P(array));
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.221r2=1.222diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.221 php-src/ext/soap/soap.c:1.222
--- php-src/ext/soap/soap.c:1.221 Mon Apr 2 13:43:29 2007
+++ php-src/ext/soap/soap.c Wed May 2 08:22:32 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: soap.c,v 1.221 2007/04/02 13:43:29 dmitry Exp $ */
+/* $Id: soap.c,v 1.222 2007/05/02 08:22:32 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -853,6 +853,8 @@
REGISTER_LONG_CONSTANT(XSD_ANYTYPE, XSD_ANYTYPE, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(XSD_ANYXML, XSD_ANYXML, CONST_CS |
CONST_PERSISTENT);
+ REGISTER_LONG_CONSTANT(APACHE_MAP, APACHE_MAP, CONST_CS |
CONST_PERSISTENT);
+
REGISTER_LONG_CONSTANT(SOAP_ENC_OBJECT, SOAP_ENC_OBJECT, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(SOAP_ENC_ARRAY, SOAP_ENC_ARRAY, CONST_CS |
CONST_PERSISTENT);
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41097.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug41097.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug41097.phpt:1.2
--- /dev/null Wed May 2 08:22:32 2007
+++ php-src/ext/soap/tests/bugs/bug41097.phpt Wed May 2 08:22:32 2007
@@ -0,0 +1,27 @@
+--TEST--
+Bug #41097 (ext/soap returning associative array as indexed without using WSDL)
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+function test($soap, $array) {
+ $soap-test($array);
+ echo (strpos($soap-__getLastRequest(), ':Map') != false)?Map\n:Array\n;
+}
+
+
+$soap = new SoapClient(null, array('uri' = 'http://uri/', 'location' =
'test://', 'exceptions' = 0, 'trace' = 1));
+test($soap, array('Foo', 'Bar'));
+test($soap, array(5 = 'Foo', 10 = 'Bar'));
+test($soap, array('5' = 'Foo', '10' = 'Bar'));
+$soap-test(new SoapVar(array('Foo', 'Bar'), APACHE_MAP));
+echo (strpos($soap-__getLastRequest(), ':Map') != false)?Map\n:Array\n;
+$soap-test(new SoapVar(array('Foo', 'Bar'), SOAP_ENC_ARRAY));
+echo (strpos($soap-__getLastRequest(), ':Map') != false)?Map\n:Array\n;
+?
+--EXPECT--
+Array
+Map
+Map
+Map
+Array
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt?r1=1.3r2=1.4diff_format=u
Index:
php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt
diff -u
php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt:1.3
php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt:1.4
---
php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt:1.3
Tue Dec 19 11:55:16 2006
+++ php-src/ext/soap/tests/interop/Round3/GroupD/r3_groupD_compound2_001w.phpt
Wed May 2 08:22:32 2007
@@ -31,7 +31,7 @@
?
--EXPECT--
?xml version=1.0 encoding=UTF-8?
-SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://soapinterop.org/person;
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap/tests/schema schema085.phpt
dmitry Wed May 2 08:35:17 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/soap/tests/schema schema085.phpt Log: New test http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/schema/schema085.phpt?view=markuprev=1.1 Index: php-src/ext/soap/tests/schema/schema085.phpt +++ php-src/ext/soap/tests/schema/schema085.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap/tests/schema schema085.phpt
dmitry Wed May 2 08:35:33 2007 UTC
Modified files:
/php-src/ext/soap/tests/schema schema085.phpt
Log:
New test
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/schema/schema085.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/schema/schema085.phpt
diff -u /dev/null php-src/ext/soap/tests/schema/schema085.phpt:1.2
--- /dev/null Wed May 2 08:35:33 2007
+++ php-src/ext/soap/tests/schema/schema085.phptWed May 2 08:35:33 2007
@@ -0,0 +1,55 @@
+--TEST--
+SOAP XML Schema 85: Extension of complex type (elements order)
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+include test_schema.inc;
+$schema = EOF
+ complexType name=testType2
+ sequence
+ element name=int type=int/
+ /sequence
+ /complexType
+ complexType name=testType
+ complexContent
+ extension base=tns:testType2
+ sequence
+ element name=int2 type=int/
+ /sequence
+ /extension
+ /complexContent
+ /complexType
+EOF;
+class A {
+ public $int = 1;
+}
+
+class B extends A {
+ public $int2 = 2;
+}
+
+
+test_schema($schema,'type=tns:testType',new B());
+echo ok;
+?
+--EXPECT--
+?xml version=1.0 encoding=UTF-8?
+SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://test-uri/; xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:testtestParam
xsi:type=ns1:testTypeint xsi:type=xsd:int1/intint2
xsi:type=xsd:int2/int2/testParam/ns1:test/SOAP-ENV:Body/SOAP-ENV:Envelope
+object(stdClass)#5 (2) {
+ [int]=
+ int(1)
+ [int2]=
+ int(2)
+}
+ok
+--UEXPECT--
+?xml version=1.0 encoding=UTF-8?
+SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=http://test-uri/; xmlns:xsd=http://www.w3.org/2001/XMLSchema;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xmlns:SOAP-ENC=http://schemas.xmlsoap.org/soap/encoding/;
SOAP-ENV:encodingStyle=http://schemas.xmlsoap.org/soap/encoding/;SOAP-ENV:Bodyns1:testtestParam
xsi:type=ns1:testTypeint xsi:type=xsd:int1/intint2
xsi:type=xsd:int2/int2/testParam/ns1:test/SOAP-ENV:Body/SOAP-ENV:Envelope
+object(stdClass)#5 (2) {
+ [uint]=
+ int(1)
+ [uint2]=
+ int(2)
+}
+ok
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug41004.phpt bug41004.wsdl
dmitry Wed May 2 09:38:12 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsbug41004.phpt bug41004.wsdl
Modified files:
/php-srcNEWS
/php-src/ext/soap php_encoding.c
Log:
Fixed bug #41004 (minOccurs=0 and null class member variable)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.669r2=1.2027.2.547.2.670diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.669 php-src/NEWS:1.2027.2.547.2.670
--- php-src/NEWS:1.2027.2.547.2.669 Wed May 2 08:22:12 2007
+++ php-src/NEWSWed May 2 09:38:11 2007
@@ -5,6 +5,7 @@
- Fixed bug #41215 (setAttribute return code reversed). (Ilia)
- Fixed bug #41097 (ext/soap returning associative array as indexed without
using WSDL). (Dmitry)
+- Fixed bug #41004 (minOccurs=0 and null class member variable). (Dmitry)
26 Apr 2007, PHP 5.2.2RC2
- Added GMP_VERSION constant. (Tony)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.30r2=1.103.2.21.2.31diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.30
php-src/ext/soap/php_encoding.c:1.103.2.21.2.31
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.30 Wed May 2 08:22:13 2007
+++ php-src/ext/soap/php_encoding.c Wed May 2 09:38:12 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.30 2007/05/02 08:22:13 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.31 2007/05/02 09:38:12 dmitry Exp $ */
#include time.h
@@ -1595,6 +1595,8 @@
property = xmlNewNode(NULL,
BAD_CAST(BOGUS));
xmlAddChild(node, property);
set_xsi_nil(property);
+ } else if (Z_TYPE_P(data) == IS_NULL
model-min_occurs == 0) {
+ return 1;
} else {
property = master_to_xml(enc,
data, style, node);
if (property-children
property-children-content
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41004.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug41004.phpt
+++ php-src/ext/soap/tests/bugs/bug41004.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41004.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/bug41004.wsdl
+++ php-src/ext/soap/tests/bugs/bug41004.wsdl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_encoding.c /ext/soap/tests/bugs bug41004.phpt bug41004.wsdl
dmitry Wed May 2 09:38:22 2007 UTC
Modified files:
/php-src/ext/soap php_encoding.c
/php-src/ext/soap/tests/bugsbug41004.phpt bug41004.wsdl
Log:
Fixed bug #41004 (minOccurs=0 and null class member variable)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.158r2=1.159diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.158
php-src/ext/soap/php_encoding.c:1.159
--- php-src/ext/soap/php_encoding.c:1.158 Wed May 2 08:22:32 2007
+++ php-src/ext/soap/php_encoding.c Wed May 2 09:38:22 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.158 2007/05/02 08:22:32 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.159 2007/05/02 09:38:22 dmitry Exp $ */
#include time.h
@@ -1563,6 +1563,8 @@
property = xmlNewNode(NULL,
BAD_CAST(BOGUS));
xmlAddChild(node, property);
set_xsi_nil(property);
+ } else if (Z_TYPE_P(data) == IS_NULL
model-min_occurs == 0) {
+ return 1;
} else {
property = master_to_xml(enc,
data, style, node);
if (property-children
property-children-content
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41004.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug41004.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/bug41004.phpt:1.2
--- /dev/null Wed May 2 09:38:22 2007
+++ php-src/ext/soap/tests/bugs/bug41004.phpt Wed May 2 09:38:22 2007
@@ -0,0 +1,36 @@
+--TEST--
+Bug #41004 minOccurs=0 and null class member variable
+--SKIPIF--
+?php require_once('skipif.inc'); ?
+--FILE--
+?php
+ini_set('soap.wsdl_cache_enabled', false);
+
+class EchoBean{
+ public $mandatoryElement;
+ public $optionalElement;
+
+}
+
+class EchoRequest{
+ public $in;
+}
+
+class EchoResponse{
+ public $out;
+}
+
+$wsdl = dirname(__FILE__)./bug41004.wsdl;
+$classmap =
array('EchoBean'='EchoBean','echo'='EchoRequest','echoResponse'='EchoResponse');
+$client = new SoapClient($wsdl, array('location'='test://',classmap =
$classmap, 'exceptions'=0, 'trace'=1));
+$echo=new EchoRequest();
+$in=new EchoBean();
+$in-mandatoryElement=REV;
+$in-optionalElement=NULL;
+$echo-in=$in;
+$client-echo($echo);
+echo $client-__getLastRequest();
+?
+--EXPECT--
+?xml version=1.0 encoding=UTF-8?
+SOAP-ENV:Envelope xmlns:SOAP-ENV=http://schemas.xmlsoap.org/soap/envelope/;
xmlns:ns1=urn:FormationSOAP-ENV:Bodyns1:echoinmandatoryElementREV/mandatoryElement/in/ns1:echo/SOAP-ENV:Body/SOAP-ENV:Envelope
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug41004.wsdl?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug41004.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/bug41004.wsdl:1.2
--- /dev/null Wed May 2 09:38:22 2007
+++ php-src/ext/soap/tests/bugs/bug41004.wsdl Wed May 2 09:38:22 2007
@@ -0,0 +1,69 @@
+?xml version=1.0 encoding=UTF-8?
+wsdl:definitions xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/;
+ xmlns:tns=urn:Formation xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/;
+ xmlns:xsd=http://www.w3.org/2001/XMLSchema; name=Formation
+ targetNamespace=urn:Formation
+ wsdl:types
+ xsd:schema targetNamespace=urn:Formation
+ xsd:element name=echo
+ xsd:complexType
+ xsd:sequence
xsd:element name=in type=tns:EchoBean/xsd:element
+ /xsd:sequence
+ /xsd:complexType
+ /xsd:element
+ xsd:element name=echoResponse
+ xsd:complexType
+ xsd:sequence
+ xsd:element name=out
type=tns:EchoBean/xsd:element
+ /xsd:sequence
+ /xsd:complexType
+ /xsd:element
+ xsd:simpleType name=Product1Type
+ xsd:restriction base=xsd:string
+ xsd:enumeration
value=REV/xsd:enumeration
+ xsd:enumeration
value=CLA/xsd:enumeration
+ /xsd:restriction
+ /xsd:simpleType
+
+ xsd:complexType name=EchoBean
+ xsd:sequence
+
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /win32 registry.c
dmitry Wed May 2 10:16:34 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/win32 registry.c
Log:
Fixed bug #41192 (Per Directory Values only work for one key)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.670r2=1.2027.2.547.2.671diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.670 php-src/NEWS:1.2027.2.547.2.671
--- php-src/NEWS:1.2027.2.547.2.670 Wed May 2 09:38:11 2007
+++ php-src/NEWSWed May 2 10:16:34 2007
@@ -3,6 +3,7 @@
?? Apr 2007, PHP 5.2.3RC3
- Fixed iterator_apply() with a callback using __call(). (Johannes)
- Fixed bug #41215 (setAttribute return code reversed). (Ilia)
+- Fixed bug #41192 (Per Directory Values only work for one key). (Dmitry)
- Fixed bug #41097 (ext/soap returning associative array as indexed without
using WSDL). (Dmitry)
- Fixed bug #41004 (minOccurs=0 and null class member variable). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/win32/registry.c?r1=1.16.4.4r2=1.16.4.5diff_format=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.16.4.4 php-src/win32/registry.c:1.16.4.5
--- php-src/win32/registry.c:1.16.4.4 Sun Apr 22 10:25:18 2007
+++ php-src/win32/registry.cWed May 2 10:16:34 2007
@@ -135,11 +135,12 @@
new_path[path_len] =
'/';
memcpy(new_path+path_len+1, name, name_len+1);
zend_str_tolower(new_path, path_len+name_len+1);
+ name_len += path_len+1;
} else {
memcpy(new_path, name,
name_len+1);
zend_str_tolower(new_path, name_len);
}
- if (LoadDirectory(directories,
subkey, new_path, path_len+name_len, ht)) {
+ if (LoadDirectory(directories,
subkey, new_path, name_len, ht)) {
ret = 1;
}
RegCloseKey(subkey);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32 registry.c
dmitry Wed May 2 10:16:48 2007 UTC
Modified files:
/php-src/win32 registry.c
Log:
Fixed bug #41192 (Per Directory Values only work for one key)
http://cvs.php.net/viewvc.cgi/php-src/win32/registry.c?r1=1.20r2=1.21diff_format=u
Index: php-src/win32/registry.c
diff -u php-src/win32/registry.c:1.20 php-src/win32/registry.c:1.21
--- php-src/win32/registry.c:1.20 Sun Apr 22 10:25:51 2007
+++ php-src/win32/registry.cWed May 2 10:16:48 2007
@@ -135,11 +135,12 @@
new_path[path_len] =
'/';
memcpy(new_path+path_len+1, name, name_len+1);
zend_str_tolower(new_path, path_len+name_len+1);
+ name_len += path_len+1;
} else {
memcpy(new_path, name,
name_len+1);
zend_str_tolower(new_path, name_len);
}
- if (LoadDirectory(directories,
subkey, new_path, path_len+name_len, ht)) {
+ if (LoadDirectory(directories,
subkey, new_path, name_len, ht)) {
ret = 1;
}
RegCloseKey(subkey);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session php_session.h session.c
tony2001Wed May 2 10:30:25 2007 UTC
Modified files:
/php-src/ext/sessionphp_session.h session.c
Log:
fix build when ext/hash is compiled as shared module
http://cvs.php.net/viewvc.cgi/php-src/ext/session/php_session.h?r1=1.113r2=1.114diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.113
php-src/ext/session/php_session.h:1.114
--- php-src/ext/session/php_session.h:1.113 Fri Jan 5 03:57:57 2007
+++ php-src/ext/session/php_session.h Wed May 2 10:30:24 2007
@@ -16,14 +16,14 @@
+--+
*/
-/* $Id: php_session.h,v 1.113 2007/01/05 03:57:57 pollita Exp $ */
+/* $Id: php_session.h,v 1.114 2007/05/02 10:30:24 tony2001 Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
#include ext/standard/php_var.h
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) !defined(COMPILE_DL_HASH)
# include ext/hash/php_hash.h
#endif
@@ -125,7 +125,7 @@
zend_bool apply_trans_sid; /* whether or not to enable trans-sid
for the current request */
long hash_func;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) !defined(COMPILE_DL_HASH)
php_hash_ops *hash_ops;
#endif
long hash_bits_per_character;
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.468r2=1.469diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.468 php-src/ext/session/session.c:1.469
--- php-src/ext/session/session.c:1.468 Wed Apr 4 19:46:42 2007
+++ php-src/ext/session/session.c Wed May 2 10:30:24 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.468 2007/04/04 19:46:42 tony2001 Exp $ */
+/* $Id: session.c,v 1.469 2007/05/02 10:30:24 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -265,7 +265,7 @@
{
PHP_MD5_CTX md5_context;
PHP_SHA1_CTX sha1_context;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) !defined(COMPILE_DL_HASH)
void *hash_context;
#endif
unsigned char *digest;
@@ -302,7 +302,7 @@
PHP_SHA1Update(sha1_context, (unsigned char *) buf,
strlen(buf));
digest_len = 20;
break;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) !defined(COMPILE_DL_HASH)
case PS_HASH_FUNC_OTHER:
if (!PS(hash_ops)) {
php_error_docref(NULL TSRMLS_CC, E_ERROR,
Invalid session hash function);
@@ -342,7 +342,7 @@
case PS_HASH_FUNC_SHA1:
PHP_SHA1Update(sha1_context,
rbuf, n);
break;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) !defined(COMPILE_DL_HASH)
case PS_HASH_FUNC_OTHER:
PS(hash_ops)-hash_update(hash_context, rbuf, n);
break;
@@ -362,7 +362,7 @@
case PS_HASH_FUNC_SHA1:
PHP_SHA1Final(digest, sha1_context);
break;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) !defined(COMPILE_DL_HASH)
case PS_HASH_FUNC_OTHER:
PS(hash_ops)-hash_final(digest, hash_context);
efree(hash_context);
@@ -568,7 +568,7 @@
long val;
char *endptr = NULL;
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) !defined(COMPILE_DL_HASH)
PS(hash_ops) = NULL;
#endif
@@ -594,7 +594,7 @@
return SUCCESS;
}
-#ifdef HAVE_HASH_EXT
+#if defined(HAVE_HASH_EXT) !defined(COMPILE_DL_HASH)
{
php_hash_ops *ops = php_hash_fetch_ops(new_value, new_value_length);
--
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_2) / NEWS /ext/soap php_encoding.c soap.c /ext/soap/tests/bugs bug41097.phpt
Dmitry, It is too late for these change for the 5.2.2 release, please revert them and re-apply them once 5.2.2 is released. Thanks, Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c /ext/soap/tests/bugs bug41004.phpt bug41004.wsdl
Dmitry, It is too late for these change for the 5.2.2 release, please revert them and re-apply them once 5.2.2 is released. Thanks, Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /win32 registry.c
Dmitry, It is too late for these change for the 5.2.2 release, please revert them and re-apply them once 5.2.2 is released. Thanks, Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /win32 registry.c
Regression from 5.2.1 or earlier? On 2-May-07, at 8:54 AM, Antony Dovgal wrote: On 05/02/2007 04:42 PM, Ilia Alshanetsky wrote: Dmitry, It is too late for these change for the 5.2.2 release, please revert them and re-apply them once 5.2.2 is released. I believe this one should stay since it fixes the regression for Win32/IIS users. -- Wbr, Antony Dovgal Ilia Alshanetsky -- 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_2) / NEWS /win32 registry.c
On 05/02/2007 04:55 PM, Ilia Alshanetsky wrote: Regression from 5.2.1 or earlier? As far as I understand, it's been broken in 5.2.1 and this patch fixes it. On 2-May-07, at 8:54 AM, Antony Dovgal wrote: On 05/02/2007 04:42 PM, Ilia Alshanetsky wrote: Dmitry, It is too late for these change for the 5.2.2 release, please revert them and re-apply them once 5.2.2 is released. I believe this one should stay since it fixes the regression for Win32/IIS users. -- 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_2) / NEWS /win32 registry.c
Regression from 5.2.1 or earlier? As far as I understand, it's been broken in 5.2.1 and this patch fixes it. From what I understand, this patch fixes broken registry .ini control in PHP on windows. It seems to eb quite isolated and if I understand the nature of the bug correctly without the fix the registry per-dir entries don't work. So it might be a reason to let this in as an exception. -- Stanislav Malyshev, Zend Products Engineer [EMAIL PROTECTED] http://www.zend.com/ -- 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_2) / NEWS /win32 registry.c
On 05/02/2007 05:24 PM, Ilia Alshanetsky wrote: Let's leave this one in then, but please revert the other changes. 5.2.2 will be packed today, so by Friday the changes can go back into the CVS. If you give me some time (2-3 hours), I'll do some more testing to ensure everything is all right. -- 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 / run-tests.php
tony2001Wed May 2 15:25:32 2007 UTC
Modified files:
/php-srcrun-tests.php
Log:
make USE_ZEND_ALLOC env var available in SKIPIF section
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.320r2=1.321diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.320 php-src/run-tests.php:1.321
--- php-src/run-tests.php:1.320 Mon Apr 23 20:55:56 2007
+++ php-src/run-tests.php Wed May 2 15:25:32 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.320 2007/04/23 20:55:56 johannes Exp $ */
+/* $Id: run-tests.php,v 1.321 2007/05/02 15:25:32 tony2001 Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -405,7 +405,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.320 $'.\n;
+ echo '$Revision: 1.321 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -1215,6 +1215,12 @@
$ini_settings .= -dunicode.semantics= .
(int)$unicode_test;
+ if ($leak_check) {
+ $env['USE_ZEND_ALLOC'] = '0';
+ } else {
+ $env['USE_ZEND_ALLOC'] = '1';
+ }
+
$output = system_with_timeout($extra $php -q
$ini_settings $test_skipif, $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php
tony2001Wed May 2 15:41:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
MFH: add USE_ZEND_ALLOC env var
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.26r2=1.226.2.37.2.27diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.26
php-src/run-tests.php:1.226.2.37.2.27
--- php-src/run-tests.php:1.226.2.37.2.26 Mon Apr 23 11:19:15 2007
+++ php-src/run-tests.php Wed May 2 15:41:06 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.26 2007/04/23 11:19:15 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.27 2007/05/02 15:41:06 tony2001 Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -398,7 +398,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.26
$'.\n;
+ echo '$Revision: 1.226.2.37.2.27
$'.\n;
exit(1);
default:
echo Illegal switch '$switch'
specified!\n;
@@ -1176,6 +1176,12 @@
save_text($test_skipif, $section_text['SKIPIF'],
$temp_skipif);
$extra = substr(PHP_OS, 0, 3) !== WIN ?
unset REQUEST_METHOD; unset QUERY_STRING;
unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;: ;
+
+ if ($leak_check) {
+ $env['USE_ZEND_ALLOC'] = '0';
+ } else {
+ $env['USE_ZEND_ALLOC'] = '1';
+ }
$output = system_with_timeout($extra $php -q
$ini_settings $test_skipif, $env);
if (!$cfg['keep']['skip']) {
@unlink($test_skipif);
--
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_2) / NEWS /win32 registry.c
Hi Ilia, The registry.c definitely must not be reverted. It fixes serious regression since 5.1.6. I can revert ext/soap and zend_compile.c fixes that I made today to not delay release process, but I don't think they may break more than zend_fcall_info_init() fix by Johannes. So it probably should be reverted too. Could you send something like CVS IS CLOSED BECAUSE OF PHP-?.?.? RELEASE PROCESS into internals@ next times. It would save our time and nerves. Thanks. Dmitry. -Original Message- From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED] Sent: Wednesday, May 02, 2007 5:25 PM To: Stanislav Malyshev Cc: Antony Dovgal; Dmitry Stogov; php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /win32 registry.c Let's leave this one in then, but please revert the other changes. 5.2.2 will be packed today, so by Friday the changes can go back into the CVS. On 2-May-07, at 9:11 AM, Stanislav Malyshev wrote: Regression from 5.2.1 or earlier? As far as I understand, it's been broken in 5.2.1 and this patch fixes it. From what I understand, this patch fixes broken registry .ini control in PHP on windows. It seems to eb quite isolated and if I understand the nature of the bug correctly without the fix the registry per-dir entries don't work. So it might be a reason to let this in as an exception. -- Stanislav Malyshev, Zend Products Engineer [EMAIL PROTECTED] http://www.zend.com/ Ilia Alshanetsky -- 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(PHP_5_2) / NEWS /win32 registry.c
Dmitry, The registry patch can stay, but please revert the soap and zend_compile changes until Friday. On 2-May-07, at 12:17 PM, Dmitry Stogov wrote: Hi Ilia, The registry.c definitely must not be reverted. It fixes serious regression since 5.1.6. I can revert ext/soap and zend_compile.c fixes that I made today to not delay release process, but I don't think they may break more than zend_fcall_info_init() fix by Johannes. So it probably should be reverted too. Could you send something like CVS IS CLOSED BECAUSE OF PHP-?.?.? RELEASE PROCESS into internals@ next times. It would save our time and nerves. Thanks. Dmitry. -Original Message- From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED] Sent: Wednesday, May 02, 2007 5:25 PM To: Stanislav Malyshev Cc: Antony Dovgal; Dmitry Stogov; php-cvs@lists.php.net Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /win32 registry.c Let's leave this one in then, but please revert the other changes. 5.2.2 will be packed today, so by Friday the changes can go back into the CVS. On 2-May-07, at 9:11 AM, Stanislav Malyshev wrote: Regression from 5.2.1 or earlier? As far as I understand, it's been broken in 5.2.1 and this patch fixes it. From what I understand, this patch fixes broken registry .ini control in PHP on windows. It seems to eb quite isolated and if I understand the nature of the bug correctly without the fix the registry per-dir entries don't work. So it might be a reason to let this in as an exception. -- Stanislav Malyshev, Zend Products Engineer [EMAIL PROTECTED] http://www.zend.com/ Ilia Alshanetsky -- 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 Ilia Alshanetsky -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/soap php_encoding.c ZendEngine2 zend_compile.c
dmitry Wed May 2 17:24:16 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/ZendEngine2zend_compile.c
/php-src/ext/soap php_encoding.c
Log:
Reverted the following fixed because of php-5.2.2 release process
- Fixed altering $this via argument named this.
- Fixed bug #41097 (ext/soap returning associative array as indexed without
using WSDL).
- Fixed bug #41004 (minOccurs=0 and null class member variable).
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.672r2=1.2027.2.547.2.673diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.672 php-src/NEWS:1.2027.2.547.2.673
--- php-src/NEWS:1.2027.2.547.2.672 Wed May 2 13:21:54 2007
+++ php-src/NEWSWed May 2 17:24:15 2007
@@ -1,13 +1,9 @@
PHPNEWS
|||
?? Apr 2007, PHP 5.2.3RC3
-- Fixed altering $this via argument named this. (Dmitry)
- Fixed iterator_apply() with a callback using __call(). (Johannes)
- Fixed bug #41215 (setAttribute return code reversed). (Ilia)
- Fixed bug #41192 (Per Directory Values only work for one key). (Dmitry)
-- Fixed bug #41097 (ext/soap returning associative array as indexed without
- using WSDL). (Dmitry)
-- Fixed bug #41004 (minOccurs=0 and null class member variable). (Dmitry)
26 Apr 2007, PHP 5.2.2RC2
- Added GMP_VERSION constant. (Tony)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.36r2=1.647.2.27.2.37diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.36
ZendEngine2/zend_compile.c:1.647.2.27.2.37
--- ZendEngine2/zend_compile.c:1.647.2.27.2.36 Wed May 2 13:21:54 2007
+++ ZendEngine2/zend_compile.c Wed May 2 17:24:15 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.36 2007/05/02 13:21:54 dmitry Exp $ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.37 2007/05/02 17:24:15 dmitry Exp $ */
#include zend_language_parser.h
#include zend.h
@@ -1265,18 +1265,9 @@
void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode
*initialization, znode *class_type, znode *varname, zend_uchar
pass_by_reference TSRMLS_DC)
{
- zend_op *opline;
+ zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
zend_arg_info *cur_arg_info;
- if (CG(active_op_array)-scope
- ((CG(active_op_array)-fn_flags ZEND_ACC_STATIC) == 0)
- (Z_TYPE(varname-u.constant) == IS_STRING)
- (Z_STRLEN(varname-u.constant) == sizeof(this)-1)
- (memcmp(Z_STRVAL(varname-u.constant), this, sizeof(this))
== 0)) {
- zend_error(E_COMPILE_ERROR, Cannot re-assign $this);
- }
-
- opline = get_next_op(CG(active_op_array) TSRMLS_CC);
CG(active_op_array)-num_args++;
opline-opcode = op;
opline-result = *var;
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.21.2.31r2=1.103.2.21.2.32diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.21.2.31
php-src/ext/soap/php_encoding.c:1.103.2.21.2.32
--- php-src/ext/soap/php_encoding.c:1.103.2.21.2.31 Wed May 2 09:38:12 2007
+++ php-src/ext/soap/php_encoding.c Wed May 2 17:24:16 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_encoding.c,v 1.103.2.21.2.31 2007/05/02 09:38:12 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.21.2.32 2007/05/02 17:24:16 dmitry Exp $ */
#include time.h
@@ -1595,8 +1595,6 @@
property = xmlNewNode(NULL,
BAD_CAST(BOGUS));
xmlAddChild(node, property);
set_xsi_nil(property);
- } else if (Z_TYPE_P(data) == IS_NULL
model-min_occurs == 0) {
- return 1;
} else {
property = master_to_xml(enc,
data, style, node);
if (property-children
property-children-content
@@ -3358,12 +3356,8 @@
int i, count = zend_hash_num_elements(Z_ARRVAL_P(array));
zend_hash_internal_pointer_reset(Z_ARRVAL_P(array));
- for (i = 0; i count; i++) {
- char *str_index;
- ulong num_index;
-
- if (zend_hash_get_current_key(Z_ARRVAL_P(array), str_index,
num_index, 0) == HASH_KEY_IS_STRING ||
- num_index != i) {
+ for (i = 0;i count;i++) {
+ if
[PHP-CVS] cvs: CVSROOT / avail
andiWed May 2 17:48:57 2007 UTC Modified files: /CVSROOTavail Log: - Give access to ext/standard for writing tests http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1266r2=1.1267diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1266 CVSROOT/avail:1.1267 --- CVSROOT/avail:1.1266Tue May 1 15:59:02 2007 +++ CVSROOT/avail Wed May 2 17:48:57 2007 @@ -215,7 +215,7 @@ avail|aditus|jpgraph avail|phallstrom|php-gtk-web/apps,php-gtk-web/include/apps.inc avail|tal,momo|php-src/ext/calendar -avail|momo|php-src/ext/standard +avail|momo,kraghuba|php-src/ext/standard avail|mbretter,philippe|pecl/radius,pecl/mqseries avail|mcmontero,blade106,scottmac,mkoppanen|pecl/imagick avail|bjori|php-src/ext/date -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Wed May 2 23:05:14 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: 5.2.2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.673r2=1.2027.2.547.2.674diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.673 php-src/NEWS:1.2027.2.547.2.674 --- php-src/NEWS:1.2027.2.547.2.673 Wed May 2 17:24:15 2007 +++ php-src/NEWSWed May 2 23:05:13 2007 @@ -1,48 +1,6 @@ PHPNEWS ||| -?? Apr 2007, PHP 5.2.3RC3 -- Fixed iterator_apply() with a callback using __call(). (Johannes) -- Fixed bug #41215 (setAttribute return code reversed). (Ilia) -- Fixed bug #41192 (Per Directory Values only work for one key). (Dmitry) - -26 Apr 2007, PHP 5.2.2RC2 -- Added GMP_VERSION constant. (Tony) -- Fixed commandline handling for CLI and CGI. (Marcus, Johannes) -- Upgraded SQLite 3 to version 3.3.16 (Ilia) -- Updated timezone database to version 2007.5. (Derick) -- Fixed bug #41175 (addAttribute() fails to add an attribute with an empty - value). (Ilia) -- Fixed bug #41159 (mysql_pconnect() hash does not account for connect - flags). (Ilia) -- Fixed bug #41121 (range() overflow handling for large numbers on 32bit - machines). (Ilia) -- Fixed bug #41118 (PHP does not handle overflow of octal integers). (Tony) -- Fixed bug #41109 (recursiveiterator.inc says implements Iterator instead of - extends). (Marcus) -- Fixed bug #40130 (TTF usage doesn't work properly under Netware). (Scott, - gk at gknw dot de) -- Fixed bug #41093 (magic_quotes_gpc ignores first arrays keys). (Arpad, Ilia) -- Fixed bug #41075 (memleak when creating default object caused exception). - (Dmitry) -- Fixed bug #41067 (json_encode() problem with UTF-16 input). (jp at df5ea - dot net. Ilia) -- Fixed bug #41063 (chdir doesn't like root paths). (Dmitry) -- Fixed bug #41061 (visibility error in ReflectionFunction::export()). - (Johannes) -- Fixed bug #41034 (json_encode() ignores null byte started keys in arrays). - (Ilia) -- Fixed bug #40935 (pdo_mysql does not raise an exception on empty - fetchAll()). (Ilia) -- Fixed bug #40861 (strtotime() doesn't handle double negative relative time - units correctly). (Derick) -- Fixed bug #40290 (strtotime() returns unexpected result with particular - timezone offset). (Derick) -- Fixed bug #39965 (Latitude and longitude are backwards in date_sun_info()). - (Derick) -- Fixed bug #39416 (Milliseconds in date()). (Derick) - - -10 Apr 2007, PHP 5.2.2RC1 +03 May 2007, PHP 5.2.2 - Improved bundled GD . Sync to 2.0.35 . Added imagegrabwindow and imagegrabscreen, capture a screen or a @@ -54,14 +12,6 @@ . Load only once the local color map from a GIF data (Pierre) . Improved thread safety of the freetype cache (Scott MacVicar, Nuno, Pierre) . imagearc huge CPU usage with large angles, libgd bug #74 (Pierre) - -- Upgraded libraries bundled in the Windows distribution. (Edin) - . c-client (imap) to version 2006e - . libpq (PostgreSQL) to version 8.2.3 - . libmysql (MySQL) to version 5.0.37 - . openssl to version 0.9.8e -- Upgraded PCRE to version 7.0 (Nuno) -- Updated timezone database to version 2007.3. (Derick) - Improved FastCGI SAPI to support external pipe and socket servers on win32. (Dmitry) - Improved Zend Memory Manager @@ -76,6 +26,8 @@ . Added ability to encode arrays with SOAP-ENC:Array type instead of WSDL type. To activate the ability use feature=SOAP_USE_XSI_ARRAY_TYPE option in SoapClient/SoapServer constructors. (Rob, Dmitry) + +- Added GMP_VERSION constant. (Tony) - Added --ri switch to CLI which allows to check extension information. (Marcus) - Added tidyNode::getParent() method (John, Nuno) - Added openbasedir and safemode checks in zip:// stream wrapper and @@ -84,6 +36,19 @@ links against an external sqlite3.dll. This provides Windows users to upgrade their sqlite3 version outside of the PHP release cycle. (Wez, Edin) - Added linenumbers to array returned by token_get_all(). (Johannes) + +- Upgraded SQLite 3 to version 3.3.16 (Ilia) +- Upgraded libraries bundled in the Windows distribution. (Edin) + . c-client (imap) to version 2006e + . libpq (PostgreSQL) to version 8.2.3 + . libmysql (MySQL) to version 5.0.37 + . openssl to version 0.9.8e +- Upgraded PCRE to version 7.0 (Nuno) + +- Updated timezone database to version 2007.5. (Derick) + +- Fixed commandline handling for CLI and CGI. (Marcus, Johannes) +- Fixed iterator_apply() with a callback using __call(). (Johannes) - Fixed possible multi bytes issues in openssl csr parser (Pierre) - Fixed shmop_open() with IPC_CREAT|IPC_EXCL flags on Windows. (Vladimir Kamaev, Tony). @@ -92,16 +57,46 @@ - Fixed zend_llist_remove_tail (Michael Wallner, Dmitry) - Fixed a thread safety issue in
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS configure.in /main php_version.h
iliaa Thu May 3 01:16:50 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.674r2=1.2027.2.547.2.675diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.674 php-src/NEWS:1.2027.2.547.2.675 --- php-src/NEWS:1.2027.2.547.2.674 Wed May 2 23:05:13 2007 +++ php-src/NEWSThu May 3 01:16:50 2007 @@ -1,5 +1,7 @@ PHPNEWS ||| +?? ??? 2007, PHP 5.2.3 + 03 May 2007, PHP 5.2.2 - Improved bundled GD . Sync to 2.0.35 http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.49r2=1.579.2.52.2.50diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.49 php-src/configure.in:1.579.2.52.2.50 --- php-src/configure.in:1.579.2.52.2.49Wed May 2 23:05:13 2007 +++ php-src/configure.inThu May 3 01:16:50 2007 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.52.2.49 2007/05/02 23:05:13 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.52.2.50 2007/05/03 01:16:50 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -43,8 +43,8 @@ MAJOR_VERSION=5 MINOR_VERSION=2 -RELEASE_VERSION=2 -EXTRA_VERSION= +RELEASE_VERSION=3 +EXTRA_VERSION=-dev PHP_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 1 + [$]MINOR_VERSION \* 100 + [$]RELEASE_VERSION` http://cvs.php.net/viewvc.cgi/php-src/main/php_version.h?r1=1.112.2.37.2.34r2=1.112.2.37.2.35diff_format=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.37.2.34 php-src/main/php_version.h:1.112.2.37.2.35 --- php-src/main/php_version.h:1.112.2.37.2.34 Wed May 2 23:05:14 2007 +++ php-src/main/php_version.h Thu May 3 01:16:50 2007 @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 2 -#define PHP_RELEASE_VERSION 2 -#define PHP_EXTRA_VERSION -#define PHP_VERSION 5.2.2 -#define PHP_VERSION_ID 50202 +#define PHP_RELEASE_VERSION 3 +#define PHP_EXTRA_VERSION -dev +#define PHP_VERSION 5.2.3-dev +#define PHP_VERSION_ID 50203 -- 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/gd gd.dsp
edink Thu May 3 02:55:11 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/gd gd.dsp Log: Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.dsp?r1=1.9.2.8.2.1r2=1.9.2.8.2.2diff_format=u Index: php-src/ext/gd/gd.dsp diff -u php-src/ext/gd/gd.dsp:1.9.2.8.2.1 php-src/ext/gd/gd.dsp:1.9.2.8.2.2 --- php-src/ext/gd/gd.dsp:1.9.2.8.2.1 Sat Mar 10 13:06:37 2007 +++ php-src/ext/gd/gd.dsp Thu May 3 02:55:11 2007 @@ -104,10 +104,6 @@ # End Source File # Begin Source File -SOURCE=.\gd_security.c -# End Source File -# Begin Source File - SOURCE=.\gdttf.c # End Source File # End Group @@ -335,6 +331,10 @@ # End Source File # Begin Source File +SOURCE=.\libgd\gd_security.c +# End Source File +# Begin Source File + SOURCE=.\libgd\gd_ss.c !IF $(CFG) == gd - Win32 Release_TS GD2 -- 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/gd .cvsignore
edink Thu May 3 02:55:53 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/gd .cvsignore Log: No need for workspace files http://cvs.php.net/viewvc.cgi/php-src/ext/gd/.cvsignore?r1=1.10.4.1r2=1.10.4.1.2.1diff_format=u Index: php-src/ext/gd/.cvsignore diff -u php-src/ext/gd/.cvsignore:1.10.4.1 php-src/ext/gd/.cvsignore:1.10.4.1.2.1 --- php-src/ext/gd/.cvsignore:1.10.4.1 Sun Oct 10 16:22:37 2004 +++ php-src/ext/gd/.cvsignore Thu May 3 02:55:53 2007 @@ -4,6 +4,7 @@ *.plg *.opt *.ncb +*.dsw Release Release_inline Debug -- 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/ingres_ii ingres.dsp
edink Thu May 3 03:11:56 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/ingres_ii ingres.dsp Log: Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/ingres_ii/ingres.dsp?r1=1.2r2=1.2.26.1diff_format=u Index: php-src/ext/ingres_ii/ingres.dsp diff -u php-src/ext/ingres_ii/ingres.dsp:1.2 php-src/ext/ingres_ii/ingres.dsp:1.2.26.1 --- php-src/ext/ingres_ii/ingres.dsp:1.2Mon Nov 13 22:28:57 2000 +++ php-src/ext/ingres_ii/ingres.dspThu May 3 03:11:56 2007 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D WIN32 /D NDEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D INGRES_EXPORTS /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\TSRM /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_INGRES_II /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_II=1 /D ZTS=1 /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\TSRM /I ..\..\..\php_build\include\ingres /D ZEND_DEBUG=0 /D WIN32 /D NDEBUG /D _WINDOWS /D COMPILE_DL_INGRES_II /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_II=1 /D ZTS=1 /YX /FD /c # ADD BASE MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD MTL /nologo /D NDEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d NDEBUG @@ -53,7 +53,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 php4ts.lib oiapi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_ingres.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline +# ADD LINK32 php4ts.lib iilibapi.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_ingres.dll /libpath:..\..\Release_TS /libpath:..\..\Release_TS_Inline /libpath:..\..\..\php_build\lib !ELSEIF $(CFG) == ingres - Win32 Debug_TS @@ -68,8 +68,8 @@ # PROP Intermediate_Dir Debug_TS # PROP Ignore_Export_Lib 0 # PROP Target_Dir -# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D INGRES_EXPORTS /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D PHP_EXPORTS /D COMPILE_DL_INGRES_II /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_II=1 /YX /FD /GZ /c +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D WIN32 /D _DEBUG /D _WINDOWS /D _MBCS /D _USRDLL /D INGRES_EXPORTS /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ..\.. /I ..\..\main /I ..\..\Zend /I ..\..\TSRM /D ZEND_DEBUG=1 /D WIN32 /D NDEBUG /D _WINDOWS /D PHP_EXPORTS /D COMPILE_DL_INGRES_II /D ZTS=1 /D ZEND_WIN32 /D PHP_WIN32 /D HAVE_II=1 /YX /FD /GZ /c # ADD BASE MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD MTL /nologo /D _DEBUG /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d _DEBUG -- 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/mcrypt mcrypt.c
edink Thu May 3 03:15:01 2007 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/mcrypt mcrypt.c Log: Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.77.4.7.4.3r2=1.77.4.7.4.4diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.77.4.7.4.3 php-src/ext/mcrypt/mcrypt.c:1.77.4.7.4.4 --- php-src/ext/mcrypt/mcrypt.c:1.77.4.7.4.3Tue May 1 16:07:37 2007 +++ php-src/ext/mcrypt/mcrypt.c Thu May 3 03:15:01 2007 @@ -16,7 +16,7 @@ | Derick Rethans [EMAIL PROTECTED]| +--+ */ -/* $Id: mcrypt.c,v 1.77.4.7.4.3 2007/05/01 16:07:37 derick Exp $ */ +/* $Id: mcrypt.c,v 1.77.4.7.4.4 2007/05/03 03:15:01 edink Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -647,8 +647,8 @@ int argc, i, count; int *key_sizes; + MCRYPT_GET_TD_ARG argc = ZEND_NUM_ARGS(); - MCRYPT_GET_TD_ARG key_sizes = mcrypt_enc_get_supported_key_sizes (pm-td, count); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c
edink Thu May 3 04:16:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c Log: Fix Windows Build http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c?r1=1.5.6.2r2=1.5.6.3diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.2 php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.3 --- php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.5.6.2Sun Mar 4 18:24:49 2007 +++ php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.cThu May 3 04:16:32 2007 @@ -31,13 +31,13 @@ */ -static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.5.6.2 2007/03/04 18:24:49 iliaa Exp $; +static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.5.6.3 2007/05/03 04:16:32 edink Exp $; +#include php.h +#include main/snprintf.h #ifdef _WIN32 #include xmlrpc_win32.h #endif -#include php.h -#include main/snprintf.h #include string.h #include stdlib.h #include xml_to_xmlrpc.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c
edink Thu May 3 04:17:18 2007 UTC Modified files: /php-src/ext/xmlrpc/libxmlrpc xml_to_xmlrpc.c Log: MFB Fix Windows Build http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c?r1=1.6r2=1.7diff_format=u Index: php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c diff -u php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.6 php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.7 --- php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c:1.6Wed Feb 21 14:24:44 2007 +++ php-src/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.cThu May 3 04:17:18 2007 @@ -31,13 +31,13 @@ */ -static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.6 2007/02/21 14:24:44 tony2001 Exp $; +static const char rcsid[] = #(@) $Id: xml_to_xmlrpc.c,v 1.7 2007/05/03 04:17:18 edink Exp $; +#include php.h +#include main/snprintf.h #ifdef _WIN32 #include xmlrpc_win32.h #endif -#include php.h -#include main/snprintf.h #include string.h #include stdlib.h #include xml_to_xmlrpc.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
