[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sat Nov 24 01:31:38 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1204r2=1.1205diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1204 ZendEngine2/ChangeLog:1.1205 --- ZendEngine2/ChangeLog:1.1204Fri Nov 23 01:31:35 2007 +++ ZendEngine2/ChangeLog Sat Nov 24 01:31:37 2007 @@ -1,3 +1,31 @@ +2007-11-23 Dmitry Stogov [EMAIL PROTECTED] + +* zend.h + zend.h + zend_vm_execute.h + zend_vm_execute.h + zend_vm_execute.skl + zend_vm_execute.skl: + Fixed compilation on Windows + +* zend.h + zend.h: + Fixed definitions + +2007-11-23 Marcus Boerger [EMAIL PROTECTED] + +* tests/lsb_018.phpt + tests/lsb_018.phpt: + + +* tests/lsb_018.phpt: + - Add another LSB test + +* tests/lsb_018.phpt + tests/lsb_018.phpt: + + file lsb_018.phpt was initially added on branch PHP_5_3. + 2007-11-22 Dmitry Stogov [EMAIL PROTECTED] * zend.h @@ -20256,7 +20284,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1204 2007/11/23 01:31:35 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1205 2007/11/24 01:31:37 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -21980,7 +22008,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1204 2007/11/23 01:31:35 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1205 2007/11/24 01:31:37 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sat Nov 24 01:31:35 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2877r2=1.2878diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2877 php-src/ChangeLog:1.2878 --- php-src/ChangeLog:1.2877Fri Nov 23 01:31:31 2007 +++ php-src/ChangeLog Sat Nov 24 01:31:34 2007 @@ -1,3 +1,85 @@ +2007-11-23 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/streamsfuncs.c: + fix proto + +2007-11-23 Robert Nicholson [EMAIL PROTECTED] + +* tests/classes/assign_op_property_001.phpt + tests/classes/assign_op_property_001.phpt + tests/classes/assign_op_property_001.phpt + tests/classes/incdec_property_001.phpt + tests/classes/incdec_property_001.phpt + tests/classes/incdec_property_001.phpt + tests/classes/incdec_property_002.phpt + tests/classes/incdec_property_002.phpt + tests/classes/incdec_property_002.phpt + tests/classes/incdec_property_003.phpt + tests/classes/incdec_property_003.phpt + tests/classes/incdec_property_003.phpt + tests/classes/incdec_property_004.phpt + tests/classes/incdec_property_004.phpt + tests/classes/incdec_property_004.phpt: + Fix incorrect use of assignment in where equality was intended - class + tests. + +2007-11-23 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend.h + ZendEngine2/zend.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.h + ZendEngine2/zend_vm_execute.skl + ZendEngine2/zend_vm_execute.skl: + Fixed compilation on Windows + +* TSRM/tsrm_config_common.h + TSRM/tsrm_config_common.h + ZendEngine2/zend.h + ZendEngine2/zend.h: + Fixed definitions + +2007-11-23 Marcus Boerger [EMAIL PROTECTED] + +* ZendEngine2/tests/lsb_018.phpt + ZendEngine2/tests/lsb_018.phpt: + + +* ZendEngine2/tests/lsb_018.phpt: + - Add another LSB test + +* ZendEngine2/tests/lsb_018.phpt + ZendEngine2/tests/lsb_018.phpt: + + file lsb_018.phpt was initially added on branch PHP_5_3. + +2007-11-23 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_3) + NEWS: + -** empty log message *** + +* ext/soap/php_sdl.c + ext/soap/php_sdl.c: + Fixed bug #42952 (soap cache file is created with insecure permissions) + +2007-11-23 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/date/php_date.c: + + MFB: Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone) + +* ext/date/php_date.c: + MFB: Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone) + +* (PHP_5_3) + ext/date/php_date.c: + + Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone) + 2007-11-22 Lukas Smith [EMAIL PROTECTED] * README.CVS-RULES:
[PHP-CVS] cvs: php-src /tests/classes assign_op_property_001.phpt incdec_property_001.phpt incdec_property_002.phpt incdec_property_003.phpt incdec_property_004.phpt
nicholsrFri Nov 23 15:34:04 2007 UTC
Modified files:
/php-src/tests/classes incdec_property_001.phpt
assign_op_property_001.phpt
incdec_property_002.phpt
incdec_property_003.phpt
incdec_property_004.phpt
Log:
Fix incorrect use of assignment in where equality was intended - class tests.
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_001.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/classes/incdec_property_001.phpt
diff -u php-src/tests/classes/incdec_property_001.phpt:1.1
php-src/tests/classes/incdec_property_001.phpt:1.2
--- php-src/tests/classes/incdec_property_001.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_001.phpt Fri Nov 23 15:34:04 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/assign_op_property_001.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/classes/assign_op_property_001.phpt
diff -u php-src/tests/classes/assign_op_property_001.phpt:1.1
php-src/tests/classes/assign_op_property_001.phpt:1.2
--- php-src/tests/classes/assign_op_property_001.phpt:1.1 Fri Dec 19
15:08:56 2003
+++ php-src/tests/classes/assign_op_property_001.phpt Fri Nov 23 15:34:04 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_002.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/classes/incdec_property_002.phpt
diff -u php-src/tests/classes/incdec_property_002.phpt:1.1
php-src/tests/classes/incdec_property_002.phpt:1.2
--- php-src/tests/classes/incdec_property_002.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_002.phpt Fri Nov 23 15:34:04 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_003.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/classes/incdec_property_003.phpt
diff -u php-src/tests/classes/incdec_property_003.phpt:1.1
php-src/tests/classes/incdec_property_003.phpt:1.2
--- php-src/tests/classes/incdec_property_003.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_003.phpt Fri Nov 23 15:34:04 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_004.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/classes/incdec_property_004.phpt
diff -u php-src/tests/classes/incdec_property_004.phpt:1.1
php-src/tests/classes/incdec_property_004.phpt:1.2
--- php-src/tests/classes/incdec_property_004.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_004.phpt Fri Nov 23 15:34:04 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
--
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) /tests/classes assign_op_property_001.phpt incdec_property_001.phpt incdec_property_002.phpt incdec_property_003.phpt incdec_property_004.phpt
nicholsrFri Nov 23 15:41:05 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/tests/classes incdec_property_002.phpt
incdec_property_004.phpt
incdec_property_003.phpt
incdec_property_001.phpt
assign_op_property_001.phpt
Log:
Fix incorrect use of assignment in where equality was intended - class tests.
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_002.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/tests/classes/incdec_property_002.phpt
diff -u php-src/tests/classes/incdec_property_002.phpt:1.1
php-src/tests/classes/incdec_property_002.phpt:1.1.6.1
--- php-src/tests/classes/incdec_property_002.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_002.phpt Fri Nov 23 15:41:05 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_004.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/tests/classes/incdec_property_004.phpt
diff -u php-src/tests/classes/incdec_property_004.phpt:1.1
php-src/tests/classes/incdec_property_004.phpt:1.1.6.1
--- php-src/tests/classes/incdec_property_004.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_004.phpt Fri Nov 23 15:41:05 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_003.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/tests/classes/incdec_property_003.phpt
diff -u php-src/tests/classes/incdec_property_003.phpt:1.1
php-src/tests/classes/incdec_property_003.phpt:1.1.6.1
--- php-src/tests/classes/incdec_property_003.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_003.phpt Fri Nov 23 15:41:05 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_001.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/tests/classes/incdec_property_001.phpt
diff -u php-src/tests/classes/incdec_property_001.phpt:1.1
php-src/tests/classes/incdec_property_001.phpt:1.1.6.1
--- php-src/tests/classes/incdec_property_001.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_001.phpt Fri Nov 23 15:41:05 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/assign_op_property_001.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/tests/classes/assign_op_property_001.phpt
diff -u php-src/tests/classes/assign_op_property_001.phpt:1.1
php-src/tests/classes/assign_op_property_001.phpt:1.1.6.1
--- php-src/tests/classes/assign_op_property_001.phpt:1.1 Fri Dec 19
15:08:56 2003
+++ php-src/tests/classes/assign_op_property_001.phpt Fri Nov 23 15:41:05 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /tests/classes assign_op_property_001.phpt incdec_property_001.phpt incdec_property_002.phpt incdec_property_003.phpt incdec_property_004.phpt
nicholsrFri Nov 23 15:36:41 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/tests/classes incdec_property_001.phpt
incdec_property_004.phpt
incdec_property_002.phpt
assign_op_property_001.phpt
incdec_property_003.phpt
Log:
Fix incorrect use of assignment in where equality was intended - class tests.
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_001.phpt?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/tests/classes/incdec_property_001.phpt
diff -u php-src/tests/classes/incdec_property_001.phpt:1.1
php-src/tests/classes/incdec_property_001.phpt:1.1.8.1
--- php-src/tests/classes/incdec_property_001.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_001.phpt Fri Nov 23 15:36:41 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_004.phpt?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/tests/classes/incdec_property_004.phpt
diff -u php-src/tests/classes/incdec_property_004.phpt:1.1
php-src/tests/classes/incdec_property_004.phpt:1.1.8.1
--- php-src/tests/classes/incdec_property_004.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_004.phpt Fri Nov 23 15:36:41 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_002.phpt?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/tests/classes/incdec_property_002.phpt
diff -u php-src/tests/classes/incdec_property_002.phpt:1.1
php-src/tests/classes/incdec_property_002.phpt:1.1.8.1
--- php-src/tests/classes/incdec_property_002.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_002.phpt Fri Nov 23 15:36:41 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/assign_op_property_001.phpt?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/tests/classes/assign_op_property_001.phpt
diff -u php-src/tests/classes/assign_op_property_001.phpt:1.1
php-src/tests/classes/assign_op_property_001.phpt:1.1.8.1
--- php-src/tests/classes/assign_op_property_001.phpt:1.1 Fri Dec 19
15:08:56 2003
+++ php-src/tests/classes/assign_op_property_001.phpt Fri Nov 23 15:36:41 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
http://cvs.php.net/viewvc.cgi/php-src/tests/classes/incdec_property_003.phpt?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/tests/classes/incdec_property_003.phpt
diff -u php-src/tests/classes/incdec_property_003.phpt:1.1
php-src/tests/classes/incdec_property_003.phpt:1.1.8.1
--- php-src/tests/classes/incdec_property_003.phpt:1.1 Fri Dec 19 15:08:56 2003
+++ php-src/tests/classes/incdec_property_003.phpt Fri Nov 23 15:36:41 2007
@@ -7,13 +7,13 @@
private $real_a = 2;
function __set($property, $value) {
- if ($property = a) {
+ if ($property == a) {
$this-real_a = $value;
}
}
function __get($property) {
- if ($property = a) {
+ if ($property == a) {
return $this-real_a;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/date php_date.c
There is still a problem because if you had an exception handler you'd have the same problem. if the constructor fails it should destroy the created object. On 23-Nov-07, at 5:01 AM, Hannes Magnusson wrote: On Nov 23, 2007 1:15 AM, Ilia Alshanetsky [EMAIL PROTECTED] wrote: iliaa Fri Nov 23 00:15:37 2007 UTC Modified files: /php-src/ext/date php_date.c Log: MFB: Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone) You are misreading the bug report. It doesn't really have anything to do with the date extension. The problem is that exceptions thrown via zend_parse_parameters() are caught by a user defined error handler (which should obviously not catch exceptions). -Hannes -- 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
RE: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/interbase ibase_query.c /ext/reflection php_reflection.c /ext/spl php_spl.c /main main.c TSRM tsrm_config_common.h tsrm_virtual_cwd.c ZendEngine2 zend.h
Thank you for catching this.
I'll fix it today.
Dmitry.
-Original Message-
From: Hannes Magnusson [mailto:[EMAIL PROTECTED]
Sent: Friday, November 23, 2007 2:21 PM
To: Dmitry Stogov
Cc: php-cvs@lists.php.net
Subject: Re: [PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
/ext/interbase ibase_query.c /ext/reflection php_reflection.c
/ext/spl php_spl.c /main main.c TSRM tsrm_config_common.h
tsrm_virtual_cwd.c ZendEngine2 zend.h zend_API.c
zend_builtin_functions.c zend
On Nov 22, 2007 2:27 PM, Dmitry Stogov [EMAIL PROTECTED] wrote:
dmitry Thu Nov 22 13:27:15 2007 UTC
Added files: (Branch: PHP_5_3)
/ZendEngine2/tests bug43128.phpt
Modified files:
/php-srcNEWS
/TSRM tsrm_config_common.h tsrm_virtual_cwd.c
/ZendEngine2zend.h zend_API.c zend_builtin_functions.c
zend_compile.c zend_compile.h zend_execute.c
zend_execute_API.c zend_object_handlers.c
zend_vm_execute.h zend_vm_execute.skl
/php-src/ext/interbase ibase_query.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/splphp_spl.c
/php-src/main main.c
Log:
Fixed bug #43128 (Very long class name causes segfault)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.1
1r2=1.293.2.11.2.9.2.12diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.11
ZendEngine2/zend.h:1.293.2.11.2.9.2.12
--- ZendEngine2/zend.h:1.293.2.11.2.9.2.11 Wed Nov 21 14:55:41 2007
+++ ZendEngine2/zend.h Thu Nov 22 13:27:11 2007
@@ -17,7 +17,7 @@
+-
-+
*/
-/* $Id: zend.h,v 1.293.2.11.2.9.2.11 2007/11/21 14:55:41
dmitry Exp $
*/
+/* $Id: zend.h,v 1.293.2.11.2.9.2.12 2007/11/22 13:27:11
dmitry Exp $
+*/
#ifndef ZEND_H
#define ZEND_H
@@ -177,9 +177,17 @@
#endif
#if (HAVE_ALLOCA || (defined (__GNUC__) __GNUC__ = 2))
!(defined(ZTS) defined(ZEND_WIN32)) !(defined(ZTS)
defined(NETWARE)) !(defined(ZTS) defined(HPUX))
!defined(DARWIN) -# define do_alloca(p) alloca(p) -# define
free_alloca(p)
+# define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
+# define ALLOCA_FLAG(name) \
+ zend_bool name;
+# define do_alloca_ex(size, limit, use_heap) \
+ ((use_heap = (UNEXPECTED((size) (limit ? emalloc(size) :
+alloca(size)) # define do_alloca(size, use_heap) \
+ do_alloca_ex(size, ZEND_ALLOCA_MAX_SIZE, use_heap)
+# define free_alloca(p, use_heap) \
+ do { if (UNEXPECTED(use_heap)) efree(p); } while (0)
#else
+# define ALLOCA_FLAG(name)
# define do_alloca(p) emalloc(p)
# define free_alloca(p)efree(p)
#endif
Should that be
#define do_alloca(p, foo) emalloc(p)
#define free_alloca(p, foo) efree(p)
?
-Hannes
--
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_3) / NEWS /ext/interbase ibase_query.c /ext/reflection php_reflection.c /ext/spl php_spl.c /main main.c TSRM tsrm_config_common.h tsrm_virtual_cwd.c ZendEngine2 zend.h
On Nov 22, 2007 2:27 PM, Dmitry Stogov [EMAIL PROTECTED] wrote:
dmitry Thu Nov 22 13:27:15 2007 UTC
Added files: (Branch: PHP_5_3)
/ZendEngine2/tests bug43128.phpt
Modified files:
/php-srcNEWS
/TSRM tsrm_config_common.h tsrm_virtual_cwd.c
/ZendEngine2zend.h zend_API.c zend_builtin_functions.c
zend_compile.c zend_compile.h zend_execute.c
zend_execute_API.c zend_object_handlers.c
zend_vm_execute.h zend_vm_execute.skl
/php-src/ext/interbase ibase_query.c
/php-src/ext/reflection php_reflection.c
/php-src/ext/splphp_spl.c
/php-src/main main.c
Log:
Fixed bug #43128 (Very long class name causes segfault)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.11r2=1.293.2.11.2.9.2.12diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.11
ZendEngine2/zend.h:1.293.2.11.2.9.2.12
--- ZendEngine2/zend.h:1.293.2.11.2.9.2.11Wed Nov 21 14:55:41 2007
+++ ZendEngine2/zend.hThu Nov 22 13:27:11 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend.h,v 1.293.2.11.2.9.2.11 2007/11/21 14:55:41 dmitry Exp $ */
+/* $Id: zend.h,v 1.293.2.11.2.9.2.12 2007/11/22 13:27:11 dmitry Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -177,9 +177,17 @@
#endif
#if (HAVE_ALLOCA || (defined (__GNUC__) __GNUC__ = 2)) !(defined(ZTS)
defined(ZEND_WIN32)) !(defined(ZTS) defined(NETWARE))
!(defined(ZTS) defined(HPUX)) !defined(DARWIN)
-# define do_alloca(p) alloca(p)
-# define free_alloca(p)
+# define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
+# define ALLOCA_FLAG(name) \
+ zend_bool name;
+# define do_alloca_ex(size, limit, use_heap) \
+ ((use_heap = (UNEXPECTED((size) (limit ? emalloc(size) :
alloca(size))
+# define do_alloca(size, use_heap) \
+ do_alloca_ex(size, ZEND_ALLOCA_MAX_SIZE, use_heap)
+# define free_alloca(p, use_heap) \
+ do { if (UNEXPECTED(use_heap)) efree(p); } while (0)
#else
+# define ALLOCA_FLAG(name)
# define do_alloca(p)emalloc(p)
# define free_alloca(p) efree(p)
#endif
Should that be
#define do_alloca(p, foo) emalloc(p)
#define free_alloca(p, foo) efree(p)
?
-Hannes
--
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
dmitry Fri Nov 23 10:02:53 2007 UTC
Modified files:
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #42952 (soap cache file is created with insecure permissions)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.109r2=1.110diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.109 php-src/ext/soap/php_sdl.c:1.110
--- php-src/ext/soap/php_sdl.c:1.109Mon May 21 13:14:02 2007
+++ php-src/ext/soap/php_sdl.c Fri Nov 23 10:02:53 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.109 2007/05/21 13:14:02 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.110 2007/11/23 10:02:53 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -2015,7 +2015,7 @@
#ifdef ZEND_WIN32
f = open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE);
#else
- f =
open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE|S_IROTH|S_IWOTH|S_IRGRP|S_IWGRP);
+ f = open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE);
#endif
if (f 0) {return;}
@@ -3117,16 +3117,24 @@
unsigned char digest[16];
int len = strlen(SOAP_GLOBAL(cache_dir));
time_t cached;
+ char *user = php_get_current_user();
+ int user_len = user ? strlen(user) + 1 : 0;
md5str[0] = '\0';
PHP_MD5Init(context);
PHP_MD5Update(context, (unsigned char*)uri, uri_len);
PHP_MD5Final(digest, context);
make_digest(md5str, digest);
- key = emalloc(len+sizeof(/wsdl-)-1+sizeof(md5str));
+ key = emalloc(len+sizeof(/wsdl-)-1+user_len+sizeof(md5str));
memcpy(key,SOAP_GLOBAL(cache_dir),len);
memcpy(key+len,/wsdl-,sizeof(/wsdl-)-1);
- memcpy(key+len+sizeof(/wsdl-)-1,md5str,sizeof(md5str));
+ len += sizeof(/wsdl-)-1;
+ if (user_len) {
+ memcpy(key+len, user, user_len-1);
+ len += user_len-1;
+ key[len++] = '-';
+ }
+ memcpy(key+len,md5str,sizeof(md5str));
if ((sdl = get_sdl_from_cache(key, uri,
t-SOAP_GLOBAL(cache_ttl), cached TSRMLS_CC)) != NULL) {
t = cached;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/soap php_sdl.c
dmitry Fri Nov 23 10:02:24 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap php_sdl.c
Log:
Fixed bug #42952 (soap cache file is created with insecure permissions)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.9r2=1.88.2.12.2.9.2.1diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.9
php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.1
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.9Mon May 21 13:13:50 2007
+++ php-src/ext/soap/php_sdl.c Fri Nov 23 10:02:24 2007
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.9 2007/05/21 13:13:50 dmitry Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.1 2007/11/23 10:02:24 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -2015,7 +2015,7 @@
#ifdef ZEND_WIN32
f = open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE);
#else
- f =
open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE|S_IROTH|S_IWOTH|S_IRGRP|S_IWGRP);
+ f = open(fn,O_CREAT|O_WRONLY|O_EXCL|O_BINARY,S_IREAD|S_IWRITE);
#endif
if (f 0) {return;}
@@ -3117,16 +3117,24 @@
unsigned char digest[16];
int len = strlen(SOAP_GLOBAL(cache_dir));
time_t cached;
+ char *user = php_get_current_user();
+ int user_len = user ? strlen(user) + 1 : 0;
md5str[0] = '\0';
PHP_MD5Init(context);
PHP_MD5Update(context, (unsigned char*)uri, uri_len);
PHP_MD5Final(digest, context);
make_digest(md5str, digest);
- key = emalloc(len+sizeof(/wsdl-)-1+sizeof(md5str));
+ key = emalloc(len+sizeof(/wsdl-)-1+user_len+sizeof(md5str));
memcpy(key,SOAP_GLOBAL(cache_dir),len);
memcpy(key+len,/wsdl-,sizeof(/wsdl-)-1);
- memcpy(key+len+sizeof(/wsdl-)-1,md5str,sizeof(md5str));
+ len += sizeof(/wsdl-)-1;
+ if (user_len) {
+ memcpy(key+len, user, user_len-1);
+ len += user_len-1;
+ key[len++] = '-';
+ }
+ memcpy(key+len,md5str,sizeof(md5str));
if ((sdl = get_sdl_from_cache(key, uri,
t-SOAP_GLOBAL(cache_ttl), cached TSRMLS_CC)) != NULL) {
t = cached;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/date php_date.c
On Nov 23, 2007 1:15 AM, Ilia Alshanetsky [EMAIL PROTECTED] wrote: iliaa Fri Nov 23 00:15:37 2007 UTC Modified files: /php-src/ext/date php_date.c Log: MFB: Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone) You are misreading the bug report. It doesn't really have anything to do with the date extension. The problem is that exceptions thrown via zend_parse_parameters() are caught by a user defined error handler (which should obviously not catch exceptions). -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
dmitry Fri Nov 23 11:31:23 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
Log:
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.53r2=1.2027.2.547.2.965.2.54diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.53
php-src/NEWS:1.2027.2.547.2.965.2.54
--- php-src/NEWS:1.2027.2.547.2.965.2.53Thu Nov 22 13:27:10 2007
+++ php-src/NEWSFri Nov 23 11:31:22 2007
@@ -63,6 +63,8 @@
The EG(function_state_ptr) is completely removed,
EG(current_execute_data)-function_state must be used instead). (Dmitry)
- Fixed bug #43128 (Very long class name causes segfault). (Dmitry)
+- Fixed bug #42952 (soap cache file is created with insecure permissions).
+ (Dmitry)
- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dmitry)
- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines).
(Nuno)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard streamsfuncs.c
stasFri Nov 23 19:48:56 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard streamsfuncs.c
Log:
fix proto
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.6r2=1.58.2.6.2.15.2.7diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.6
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.7
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.6 Tue Nov 20
22:17:00 2007
+++ php-src/ext/standard/streamsfuncs.c Fri Nov 23 19:48:56 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.6 2007/11/20 22:17:00 johannes Exp $
*/
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.7 2007/11/23 19:48:56 stas Exp $ */
#include php.h
#include php_globals.h
@@ -389,7 +389,7 @@
}
/* }}} */
-/* {{{ proto long stream_get_contents(resource source [, long maxlen [, long
offset]])
+/* {{{ proto string stream_get_contents(resource source [, long maxlen [, long
offset]])
Reads all remaining bytes (or up to maxlen bytes) from a stream and returns
them as a string. */
PHP_FUNCTION(stream_get_contents)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
