[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Nov 13 01:31:30 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2866r2=1.2867diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2866 php-src/ChangeLog:1.2867 --- php-src/ChangeLog:1.2866Mon Nov 12 01:31:25 2007 +++ php-src/ChangeLog Tue Nov 13 01:31:30 2007 @@ -1,3 +1,279 @@ +2007-11-12 Zoe Slattery [EMAIL PROTECTED] + +* (PHP_5_2) + run-tests.php + run-tests.php: + MFH: Changing the regex for %f so the it will match E-, E+ and E. + +2007-11-12 Rob Richards [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + BFN + +* (PHP_5_2) + ext/simplexml/simplexml.c + ext/simplexml/simplexml.c + ext/simplexml/tests/bug43221.phpt + ext/simplexml/tests/bug43221.phpt: + MFH: fix bug #43221 (SimpleXML adding default namespace in addAttribute) + add test + +* ext/simplexml/simplexml.c + ext/simplexml/tests/bug43221.phpt + ext/simplexml/tests/bug43221.phpt + ext/simplexml/tests/bug43221.phpt: + fix bug #43221 (SimpleXML adding default namespace in addAttribute) + add test + +2007-11-12 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/standard/file.c + main/streams/plain_wrapper.c: + + Fixed bug #43182 (file_put_contents() LOCK_EX does not work properly on + file + +* (PHP_5_3) + ext/standard/file.c + main/streams/plain_wrapper.c: + Fixed bug #43182 (file_put_contents() LOCK_EX does not work properly on + file + truncation). + +2007-11-12 Zoe Slattery [EMAIL PROTECTED] + +* run-tests.php: + Changing the regex for %f so the it will match E-, E+ and E. + +2007-11-12 Dmitry Stogov [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.c + ZendEngine2/tests/bug42859.phpt + ZendEngine2/tests/bug42859.phpt + ZendEngine2/tests/ns_029.phpt + ZendEngine2/tests/ns_029.phpt + ZendEngine2/tests/ns_030.phpt + ZendEngine2/tests/ns_030.phpt: + better error messages + +2007-11-12 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.c + ZendEngine2/tests/errmsg_038.phpt + ZendEngine2/tests/errmsg_038.phpt: + MFH: fix error message (reported by Felipe Nascimento) + +* ZendEngine2/zend_compile.c + ZendEngine2/tests/errmsg_038.phpt: + fix error message (reported by Felipe Nascimento) + +2007-11-12 Raghubansh Kumar [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/tests/array/ksort_basic.phpt + ext/standard/tests/array/ksort_basic.phpt + ext/standard/tests/array/ksort_error.phpt + ext/standard/tests/array/ksort_error.phpt + ext/standard/tests/array/ksort_object.phpt + ext/standard/tests/array/ksort_object.phpt + ext/standard/tests/array/ksort_variation1.phpt + ext/standard/tests/array/ksort_variation1.phpt + ext/standard/tests/array/ksort_variation10.phpt + ext/standard/tests/array/ksort_variation10.phpt + ext/standard/tests/array/ksort_variation11.phpt + ext/standard/tests/array/ksort_variation11.phpt + ext/standard/tests/array/ksort_variation2.phpt + ext/standard/tests/array/ksort_variation2.phpt + ext/standard/tests/array/ksort_variation3.phpt + ext/standard/tests/array/ksort_variation3.phpt + ext/standard/tests/array/ksort_variation4.phpt + ext/standard/tests/array/ksort_variation4.phpt + ext/standard/tests/array/ksort_variation5.phpt + ext/standard/tests/array/ksort_variation5.phpt + ext/standard/tests/array/ksort_variation6.phpt + ext/standard/tests/array/ksort_variation6.phpt + ext/standard/tests/array/ksort_variation7.phpt + ext/standard/tests/array/ksort_variation7.phpt + ext/standard/tests/array/ksort_variation8.phpt + ext/standard/tests/array/ksort_variation8.phpt + ext/standard/tests/array/ksort_variation9.phpt + ext/standard/tests/array/ksort_variation9.phpt: + New testcases for ksort() function + +* (PHP_5_2) + ext/standard/tests/array/krsort_basic.phpt + ext/standard/tests/array/krsort_basic.phpt + ext/standard/tests/array/krsort_error.phpt + ext/standard/tests/array/krsort_error.phpt + ext/standard/tests/array/krsort_object.phpt + ext/standard/tests/array/krsort_object.phpt + ext/standard/tests/array/krsort_variation1.phpt + ext/standard/tests/array/krsort_variation1.phpt + ext/standard/tests/array/krsort_variation10.phpt + ext/standard/tests/array/krsort_variation10.phpt + ext/standard/tests/array/krsort_variation11.phpt + ext/standard/tests/array/krsort_variation11.phpt + ext/standard/tests/array/krsort_variation2.phpt + ext/standard/tests/array/krsort_variation2.phpt +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Nov 13 01:31:34 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1196r2=1.1197diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1196 ZendEngine2/ChangeLog:1.1197 --- ZendEngine2/ChangeLog:1.1196Mon Nov 12 01:31:27 2007 +++ ZendEngine2/ChangeLog Tue Nov 13 01:31:33 2007 @@ -1,3 +1,52 @@ +2007-11-12 Dmitry Stogov [EMAIL PROTECTED] + +* zend_compile.c + zend_compile.c + tests/bug42859.phpt + tests/bug42859.phpt + tests/ns_029.phpt + tests/ns_029.phpt + tests/ns_030.phpt + tests/ns_030.phpt: + better error messages + +2007-11-12 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_2) + zend_compile.c + zend_compile.c + tests/errmsg_038.phpt + tests/errmsg_038.phpt: + MFH: fix error message (reported by Felipe Nascimento) + +* zend_compile.c + tests/errmsg_038.phpt: + fix error message (reported by Felipe Nascimento) + +2007-11-12 Dmitry Stogov [EMAIL PROTECTED] + +* zend_compile.c + zend_compile.c + tests/bug43183.phpt + tests/bug43183.phpt + tests/bug43183.phpt: + Fixed bug #43183 (use of the same class in difference scripts results in + a fatal error) + +* zend_object_handlers.c + zend_object_handlers.c + zend_object_handlers.c + tests/bug42937.phpt + tests/bug42937.phpt: + Fixed bug #42937 (__call() method not invoked when methods are called on + parent from child class). + +* tests/bug42937.phpt + tests/bug42937.phpt + tests/bug42937.phpt: +1.1.4; + file bug42937.phpt was initially added on branch PHP_5_2. + 2007-11-11 Johannes Schl�ter [EMAIL PROTECTED] * (PHP_5_3) @@ -19948,7 +19997,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1196 2007/11/12 01:31:27 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1197 2007/11/13 01:31:33 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -21672,7 +21721,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1196 2007/11/12 01:31:27 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1197 2007/11/13 01:31:33 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug42736.phpt
tony2001Mon Nov 12 11:22:00 2007 UTC
Added files:
/php-src/ext/xmlrpc/tests bug42736.phpt
Modified files:
/php-src/ext/xmlrpc xmlrpc-epi-php.c
Log:
fix #42736 (xmlrpc_server_call_method() crashes)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.52r2=1.53diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.52
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.53
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.52Thu Sep 27 18:28:43 2007
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Mon Nov 12 11:22:00 2007
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.52 2007/09/27 18:28:43 dmitry Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.53 2007/11/12 11:22:00 tony2001 Exp $ */
/**
* BUGS: *
@@ -864,8 +864,7 @@
pData-php_executed = 1;
- zval_dtor(xmlrpc_params);
- FREE_ZVAL(xmlrpc_params);
+ zval_ptr_dtor(xmlrpc_params);
return NULL;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug42736.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug42736.phpt
+++ php-src/ext/xmlrpc/tests/bug42736.phpt
--TEST--
Bug #42736 (xmlrpc_server_call_method() crashes)
--SKIPIF--
?php if (!extension_loaded(xmlrpc)) print skip; ?
--FILE--
?php
class SOAP_Array {
public function get($id){
return $this-add($id);
}
}
$xml = xmlrpc_server_create();
$Myrequest = '?xml version=1.0
encoding=UTF-8?methodCallmethodNameGetProducts/methodNameparamsparamvaluedateTime.iso860120060922T14:26:19/dateTime.iso8601/value/param/params/methodCall';
class MyClass {
function GetProducts($dummy, $time){
return array('faultString' = $time);
}
}
$myclass = new MyClass();
xmlrpc_server_register_method($xml, 'GetProducts', array($myclass,
'GetProducts'));
$response = xmlrpc_server_call_method($xml, $Myrequest, null);
var_dump($response);
echo Done\n;
?
--EXPECTF--
string(402) ?xml version=1.0 encoding=iso-8859-1?
methodResponse
params
param
value
struct
member
namefaultString/name
value
array
data
value
dateTime.iso860120060922T14:26:19/dateTime.iso8601
/value
/data
/array
/value
/member
/struct
/value
/param
/params
/methodResponse
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug42736.phpt
tony2001Mon Nov 12 11:23:05 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/xmlrpc/tests bug42736.phpt
Modified files:
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-srcNEWS
Log:
MFH: fix #42736 (xmlrpc_server_call_method() crashes)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6.2.1r2=1.39.2.5.2.6.2.2diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.1
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.2
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6.2.1Thu Sep 27
18:00:46 2007
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Mon Nov 12 11:23:04 2007
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.1 2007/09/27 18:00:46 dmitry Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6.2.2 2007/11/12 11:23:04 tony2001 Exp $
*/
/**
* BUGS: *
@@ -523,7 +523,7 @@
break;
case HASH_KEY_IS_STRING:
case HASH_KEY_IS_LONG:
- ht = HASH_OF(*pIter);
+ ht = HASH_OF(*pIter);
if (ht) {
ht-nApplyCount++;
}
@@ -874,10 +874,9 @@
pData-php_executed = 1;
- zval_dtor(xmlrpc_params);
- FREE_ZVAL(xmlrpc_params);
+ zval_ptr_dtor(xmlrpc_params);
- return NULL;
+ return NULL;
}
/* called by the C server when it first receives an introspection request. We
pass this on to
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.46r2=1.2027.2.547.2.965.2.47diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.46
php-src/NEWS:1.2027.2.547.2.965.2.47
--- php-src/NEWS:1.2027.2.547.2.965.2.46Fri Nov 9 16:27:42 2007
+++ php-src/NEWSMon Nov 12 11:23:04 2007
@@ -59,6 +59,7 @@
- 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)
+- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
- Fixed bug #42657 (ini_get() returns incorrect value when default is NULL).
(Jani)
- Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug42736.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug42736.phpt
+++ php-src/ext/xmlrpc/tests/bug42736.phpt
--TEST--
Bug #42736 (xmlrpc_server_call_method() crashes)
--SKIPIF--
?php if (!extension_loaded(xmlrpc)) print skip; ?
--FILE--
?php
class SOAP_Array {
public function get($id){
return $this-add($id);
}
}
$xml = xmlrpc_server_create();
$Myrequest = '?xml version=1.0
encoding=UTF-8?methodCallmethodNameGetProducts/methodNameparamsparamvaluedateTime.iso860120060922T14:26:19/dateTime.iso8601/value/param/params/methodCall';
class MyClass {
function GetProducts($dummy, $time){
return array('faultString' = $time);
}
}
$myclass = new MyClass();
xmlrpc_server_register_method($xml, 'GetProducts', array($myclass,
'GetProducts'));
$response = xmlrpc_server_call_method($xml, $Myrequest, null);
var_dump($response);
echo Done\n;
?
--EXPECTF--
string(402) ?xml version=1.0 encoding=iso-8859-1?
methodResponse
params
param
value
struct
member
namefaultString/name
value
array
data
value
dateTime.iso860120060922T14:26:19/dateTime.iso8601
/value
/data
/array
/value
/member
/struct
/value
/param
/params
/methodResponse
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/xmlrpc xmlrpc-epi-php.c /ext/xmlrpc/tests bug42736.phpt
tony2001Mon Nov 12 11:24:14 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/xmlrpc/tests bug42736.phpt
Modified files:
/php-src/ext/xmlrpc xmlrpc-epi-php.c
/php-srcNEWS
Log:
MFH: fix #42736 (xmlrpc_server_call_method() crashes)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.39.2.5.2.6r2=1.39.2.5.2.7diff_format=u
Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c
diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6
php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.7
--- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.39.2.5.2.6Tue Sep 18 19:49:53 2007
+++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Mon Nov 12 11:24:13 2007
@@ -51,7 +51,7 @@
+--+
*/
-/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.6 2007/09/18 19:49:53 iliaa Exp $ */
+/* $Id: xmlrpc-epi-php.c,v 1.39.2.5.2.7 2007/11/12 11:24:13 tony2001 Exp $ */
/**
* BUGS: *
@@ -874,10 +874,9 @@
pData-php_executed = 1;
- zval_dtor(xmlrpc_params);
- FREE_ZVAL(xmlrpc_params);
+ zval_ptr_dtor(xmlrpc_params);
- return NULL;
+ return NULL;
}
/* called by the C server when it first receives an introspection request. We
pass this on to
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1004r2=1.2027.2.547.2.1005diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1004 php-src/NEWS:1.2027.2.547.2.1005
--- php-src/NEWS:1.2027.2.547.2.1004Mon Nov 12 09:11:48 2007
+++ php-src/NEWSMon Nov 12 11:24:13 2007
@@ -7,6 +7,7 @@
segfault). (Dmitry)
- Fixed bug #42937 (__call() method not invoked when methods are called on
parent from child class). (Dmitry)
+- Fixed bug #42736 (xmlrpc_server_call_method() crashes). (Tony)
08 Nov 2007, PHP 5.2.5
- Upgraded PCRE to version 7.3 (Nuno)
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/tests/bug42736.phpt?view=markuprev=1.1
Index: php-src/ext/xmlrpc/tests/bug42736.phpt
+++ php-src/ext/xmlrpc/tests/bug42736.phpt
--TEST--
Bug #42736 (xmlrpc_server_call_method() crashes)
--SKIPIF--
?php if (!extension_loaded(xmlrpc)) print skip; ?
--FILE--
?php
class SOAP_Array {
public function get($id){
return $this-add($id);
}
}
$xml = xmlrpc_server_create();
$Myrequest = '?xml version=1.0
encoding=UTF-8?methodCallmethodNameGetProducts/methodNameparamsparamvaluedateTime.iso860120060922T14:26:19/dateTime.iso8601/value/param/params/methodCall';
class MyClass {
function GetProducts($dummy, $time){
return array('faultString' = $time);
}
}
$myclass = new MyClass();
xmlrpc_server_register_method($xml, 'GetProducts', array($myclass,
'GetProducts'));
$response = xmlrpc_server_call_method($xml, $Myrequest, null);
var_dump($response);
echo Done\n;
?
--EXPECTF--
string(402) ?xml version=1.0 encoding=iso-8859-1?
methodResponse
params
param
value
struct
member
namefaultString/name
value
array
data
value
dateTime.iso860120060922T14:26:19/dateTime.iso8601
/value
/data
/array
/value
/member
/struct
/value
/param
/params
/methodResponse
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
derick Mon Nov 12 13:06:55 2007 UTC Modified files: /CVSROOTavail Log: - Give lukas phpweb access. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1323r2=1.1324diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1323 CVSROOT/avail:1.1324 --- CVSROOT/avail:1.1323Fri Nov 9 12:13:47 2007 +++ CVSROOT/avail Mon Nov 12 13:06:53 2007 @@ -52,7 +52,7 @@ # The PHP Web Group maintains www.php.net, news.php.net, bugs.php.net, # and master.php.net. -avail|johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web +avail|lsmith,johannes,ilia,cmv,tcobb,gareth,jah,eschmid,ronabop,derick,sterling,stas,phildriscoll,jmoore,andre,jani,david,lyric,zimt,mk,goba,zak,jmcastagnetto,dams,tom,jacques,sebastian,georg,mj,imajes,cortesi,sander,markonen,edink,jan,victor,mfischer,wez,sesser,pollita,alindeman,magnus,iliaa,philip,didou,sfox,sean,dufuz,nlopess,pajoye,helly,tony2001,bjori|phpweb,php-bugs-web,php-master-web,php-news-web,php-hosts-web # The PHP Presentation Group has access to the presentations on the # conf.php.net site. -- 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
zoe Mon Nov 12 18:22:10 2007 UTC
Modified files:
/php-srcrun-tests.php
Log:
Changing the regex for %f so the it will match E-, E+ and E.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.330r2=1.331diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.330 php-src/run-tests.php:1.331
--- php-src/run-tests.php:1.330 Fri Sep 14 15:36:29 2007
+++ php-src/run-tests.php Mon Nov 12 18:22:10 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.330 2007/09/14 15:36:29 nlopess Exp $ */
+/* $Id: run-tests.php,v 1.331 2007/11/12 18:22:10 zoe 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
@@ -407,7 +407,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.330 $'.\n;
+ echo '$Revision: 1.331 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -1557,7 +1557,7 @@
$wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re);
$wanted_re = str_replace('%d', '\d+', $wanted_re);
$wanted_re = str_replace('%x', '[0-9a-fA-F]+',
$wanted_re);
- $wanted_re = str_replace('%f',
'[+-]?\.?\d+\.?\d*(?:E-?\d+)?', $wanted_re);
+ $wanted_re = str_replace('%f',
'[+-]?\.?\d+\.?\d*(?:E[+-]?\d+)?', $wanted_re);
$wanted_re = str_replace('%c', '.', $wanted_re);
// %f allows two points -.0.0 but that is the best
*simple* expression
}
--
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) / run-tests.php
zoe Mon Nov 12 18:26:37 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
MFH: Changing the regex for %f so the it will match E-, E+ and E.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.1r2=1.226.2.37.2.35.2.2diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.1
php-src/run-tests.php:1.226.2.37.2.35.2.2
--- php-src/run-tests.php:1.226.2.37.2.35.2.1 Tue Nov 6 14:38:10 2007
+++ php-src/run-tests.php Mon Nov 12 18:26:37 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.1 2007/11/06 14:38:10 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.2 2007/11/12 18:26:37 zoe 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
@@ -400,7 +400,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.1
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.2
$'.\n;
exit(1);
case 'u':
@@ -1494,7 +1494,7 @@
$wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re);
$wanted_re = str_replace('%d', '\d+', $wanted_re);
$wanted_re = str_replace('%x', '[0-9a-fA-F]+',
$wanted_re);
- $wanted_re = str_replace('%f',
'[+-]?\.?\d+\.?\d*(?:E-?\d+)?', $wanted_re);
+ $wanted_re = str_replace('%f',
'[+-]?\.?\d+\.?\d*(?:E[+-]?\d+)?', $wanted_re);
$wanted_re = str_replace('%c', '.', $wanted_re);
// %f allows two points -.0.0 but that is the best
*simple* expression
}
--
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 file.c /main/streams plain_wrapper.c
iliaa Mon Nov 12 18:44:18 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main/streams plain_wrapper.c
/php-src/ext/standard file.c
Log:
Fixed bug #43182 (file_put_contents() LOCK_EX does not work properly on file
truncation).
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.23.2.3r2=1.52.2.6.2.23.2.4diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.3
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.4
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.3 Tue Nov 6
12:12:58 2007
+++ php-src/main/streams/plain_wrapper.cMon Nov 12 18:44:18 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.3 2007/11/06 12:12:58 helly Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.4 2007/11/12 18:44:18 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -63,6 +63,9 @@
case 'x':
flags = O_CREAT|O_EXCL;
break;
+ case 'c':
+ flags = O_CREAT;
+ break;
default:
/* unknown mode */
return FAILURE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.4r2=1.409.2.6.2.28.2.5diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.4
php-src/ext/standard/file.c:1.409.2.6.2.28.2.5
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.4 Fri Nov 9 11:08:22 2007
+++ php-src/ext/standard/file.c Mon Nov 12 18:44:18 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.28.2.4 2007/11/09 11:08:22 dmitry Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.5 2007/11/12 18:44:18 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -581,6 +581,7 @@
zval *zcontext = NULL;
php_stream_context *context = NULL;
php_stream *srcstream = NULL;
+ char mode[3] = wb;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz/|lr!,
filename, filename_len, data, flags, zcontext) == FAILURE) {
return;
@@ -592,8 +593,14 @@
context = php_stream_context_from_zval(zcontext, flags
PHP_FILE_NO_DEFAULT_CONTEXT);
- stream = php_stream_open_wrapper_ex(filename, (flags PHP_FILE_APPEND)
? ab : wb,
- ((flags PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) |
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+ if (flags PHP_FILE_APPEND) {
+ mode[0] = 'a';
+ } else if (flags LOCK_EX) {
+ mode[0] = 'c';
+ }
+ mode[2] = '\0';
+
+ stream = php_stream_open_wrapper_ex(filename, mode, ((flags
PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS,
NULL, context);
if (stream == NULL) {
RETURN_FALSE;
}
@@ -603,6 +610,10 @@
RETURN_FALSE;
}
+ if (mode[0] = 'c') {
+ php_stream_truncate_set_size(stream, 0);
+ }
+
switch (Z_TYPE_P(data)) {
case IS_RESOURCE:
numbytes = php_stream_copy_to_stream(srcstream, stream,
PHP_STREAM_COPY_ALL);
--
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/standard file.c /main/streams plain_wrapper.c
iliaa Mon Nov 12 18:47:46 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main/streams plain_wrapper.c
/php-src/ext/standard file.c
/php-srcNEWS
Log:
Fixed bug #43182 (file_put_contents() LOCK_EX does not work properly on
file
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.25r2=1.52.2.6.2.26diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.25
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.26
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.25 Thu Nov 1 17:32:26 2007
+++ php-src/main/streams/plain_wrapper.cMon Nov 12 18:47:46 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.25 2007/11/01 17:32:26 jani Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.26 2007/11/12 18:47:46 iliaa Exp $ */
#include php.h
#include php_globals.h
@@ -63,6 +63,9 @@
case 'x':
flags = O_CREAT|O_EXCL;
break;
+ case 'c':
+ flags = O_CREAT;
+ break;
default:
/* unknown mode */
return FAILURE;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28r2=1.409.2.6.2.29diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28
php-src/ext/standard/file.c:1.409.2.6.2.29
--- php-src/ext/standard/file.c:1.409.2.6.2.28 Tue Sep 4 12:51:49 2007
+++ php-src/ext/standard/file.c Mon Nov 12 18:47:46 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.28 2007/09/04 12:51:49 iliaa Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.29 2007/11/12 18:47:46 iliaa Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -592,6 +592,7 @@
zval *zcontext = NULL;
php_stream_context *context = NULL;
php_stream *srcstream = NULL;
+ char mode[3] = wb;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz/|lr!,
filename, filename_len,
data, flags, zcontext) == FAILURE) {
@@ -604,8 +605,14 @@
context = php_stream_context_from_zval(zcontext, flags
PHP_FILE_NO_DEFAULT_CONTEXT);
- stream = php_stream_open_wrapper_ex(filename, (flags PHP_FILE_APPEND)
? ab : wb,
- ((flags PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) |
ENFORCE_SAFE_MODE | REPORT_ERRORS, NULL, context);
+ if (flags PHP_FILE_APPEND) {
+ mode[0] = 'a';
+ } else if (flags LOCK_EX) {
+ mode[0] = 'c';
+ }
+ mode[2] = '\0';
+
+ stream = php_stream_open_wrapper_ex(filename, mode, ((flags
PHP_FILE_USE_INCLUDE_PATH) ? USE_PATH : 0) | ENFORCE_SAFE_MODE | REPORT_ERRORS,
NULL, context);
if (stream == NULL) {
RETURN_FALSE;
}
@@ -615,6 +622,10 @@
RETURN_FALSE;
}
+ if (mode[0] = 'c') {
+ php_stream_truncate_set_size(stream, 0);
+ }
+
switch (Z_TYPE_P(data)) {
case IS_RESOURCE:
numbytes = php_stream_copy_to_stream(srcstream, stream,
PHP_STREAM_COPY_ALL);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1005r2=1.2027.2.547.2.1006diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1005 php-src/NEWS:1.2027.2.547.2.1006
--- php-src/NEWS:1.2027.2.547.2.1005Mon Nov 12 11:24:13 2007
+++ php-src/NEWSMon Nov 12 18:47:46 2007
@@ -3,6 +3,8 @@
?? ??? 2008, PHP 5.2.6
- Fixed bug #43216 (stream_is_local() returns false on file://). (Dmitry)
- Fixed bug #43201 (Crash on using unitialized vals and __get/__set). (Dmitry)
+- Fixed bug #43182 (file_put_contents() LOCK_EX does not work properly on file
+ truncation). (Ilia)
- Fixed bug #43175 (__destruct() throwing an exception with __call() causes
segfault). (Dmitry)
- Fixed bug #42937 (__call() method not invoked when methods are called on
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c /ext/simplexml/tests bug43221.phpt
rrichards Mon Nov 12 18:58:01 2007 UTC
Added files:
/php-src/ext/simplexml/testsbug43221.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
fix bug #43221 (SimpleXML adding default namespace in addAttribute)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.245r2=1.246diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.245
php-src/ext/simplexml/simplexml.c:1.246
--- php-src/ext/simplexml/simplexml.c:1.245 Sun Oct 7 05:15:04 2007
+++ php-src/ext/simplexml/simplexml.c Mon Nov 12 18:58:01 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.245 2007/10/07 05:15:04 davidw Exp $ */
+/* $Id: simplexml.c,v 1.246 2007/11/12 18:58:01 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1697,6 +1697,13 @@
localname = xmlSplitQName2((xmlChar *)qname, prefix);
if (localname == NULL) {
+ if (nsuri_len 0) {
+ if (prefix != NULL) {
+ xmlFree(prefix);
+ }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Attribute
requires prefix for namespace);
+ return;
+ }
localname = xmlStrdup((xmlChar *)qname);
}
@@ -2503,7 +2510,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.245 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.246 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug43221.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug43221.phpt
+++ php-src/ext/simplexml/tests/bug43221.phpt
--TEST--
Bug #43221 (SimpleXML adding default namespace in addAttribute)
--FILE--
?php
$xml = simplexml_load_string('?xml version=1.0 encoding=utf-8?root /');
$n = $xml-addChild(node, value);
$n-addAttribute(a, b);
$n-addAttribute(c, d, http://bar.com;);
$n-addAttribute(foo:e, f, http://bar.com;);
print_r($xml-asXml());
?
--EXPECTF--
Warning: SimpleXMLElement::addAttribute(): Attribute requires prefix for
namespace in %sbug43221.php on line %d
?xml version=1.0 encoding=utf-8?
rootnode xmlns:foo=http://bar.com; a=b foo:e=fvalue/node/root
--
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/simplexml simplexml.c /ext/simplexml/tests bug43221.phpt
rrichards Mon Nov 12 18:58:48 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/simplexml/testsbug43221.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
MFH: fix bug #43221 (SimpleXML adding default namespace in addAttribute)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.3r2=1.151.2.22.2.35.2.4diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.3
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.4
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.3 Thu Oct 11
01:03:19 2007
+++ php-src/ext/simplexml/simplexml.c Mon Nov 12 18:58:48 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.3 2007/10/11 01:03:19 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.4 2007/11/12 18:58:48 rrichards Exp $
*/
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1655,6 +1655,13 @@
localname = xmlSplitQName2((xmlChar *)qname, prefix);
if (localname == NULL) {
+ if (nsuri_len 0) {
+ if (prefix != NULL) {
+ xmlFree(prefix);
+ }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Attribute
requires prefix for namespace);
+ return;
+ }
localname = xmlStrdup((xmlChar *)qname);
}
@@ -2466,7 +2473,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.35.2.3
$);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.35.2.4
$);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug43221.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug43221.phpt
+++ php-src/ext/simplexml/tests/bug43221.phpt
--TEST--
Bug #43221 (SimpleXML adding default namespace in addAttribute)
--FILE--
?php
$xml = simplexml_load_string('?xml version=1.0 encoding=utf-8?root /');
$n = $xml-addChild(node, value);
$n-addAttribute(a, b);
$n-addAttribute(c, d, http://bar.com;);
$n-addAttribute(foo:e, f, http://bar.com;);
print_r($xml-asXml());
?
--EXPECTF--
Warning: SimpleXMLElement::addAttribute(): Attribute requires prefix for
namespace in %sbug43221.php on line %d
?xml version=1.0 encoding=utf-8?
rootnode xmlns:foo=http://bar.com; a=b foo:e=fvalue/node/root
--
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/simplexml simplexml.c /ext/simplexml/tests bug43221.phpt
rrichards Mon Nov 12 18:59:26 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/simplexml/testsbug43221.phpt
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
MFH: fix bug #43221 (SimpleXML adding default namespace in addAttribute)
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35r2=1.151.2.22.2.36diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.36
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35 Tue Jul 31 15:40:49 2007
+++ php-src/ext/simplexml/simplexml.c Mon Nov 12 18:59:26 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35 2007/07/31 15:40:49 rrichards Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.36 2007/11/12 18:59:26 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1635,6 +1635,13 @@
localname = xmlSplitQName2((xmlChar *)qname, prefix);
if (localname == NULL) {
+ if (nsuri_len 0) {
+ if (prefix != NULL) {
+ xmlFree(prefix);
+ }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, Attribute
requires prefix for namespace);
+ return;
+ }
localname = xmlStrdup((xmlChar *)qname);
}
@@ -2440,7 +2447,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.35 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.36 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/tests/bug43221.phpt?view=markuprev=1.1
Index: php-src/ext/simplexml/tests/bug43221.phpt
+++ php-src/ext/simplexml/tests/bug43221.phpt
--TEST--
Bug #43221 (SimpleXML adding default namespace in addAttribute)
--FILE--
?php
$xml = simplexml_load_string('?xml version=1.0 encoding=utf-8?root /');
$n = $xml-addChild(node, value);
$n-addAttribute(a, b);
$n-addAttribute(c, d, http://bar.com;);
$n-addAttribute(foo:e, f, http://bar.com;);
print_r($xml-asXml());
?
--EXPECTF--
Warning: SimpleXMLElement::addAttribute(): Attribute requires prefix for
namespace in %sbug43221.php on line %d
?xml version=1.0 encoding=utf-8?
rootnode xmlns:foo=http://bar.com; a=b foo:e=fvalue/node/root
--
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
rrichards Mon Nov 12 19:00:05 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1006r2=1.2027.2.547.2.1007diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1006 php-src/NEWS:1.2027.2.547.2.1007 --- php-src/NEWS:1.2027.2.547.2.1006Mon Nov 12 18:47:46 2007 +++ php-src/NEWSMon Nov 12 19:00:04 2007 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2008, PHP 5.2.6 +- Fixed bug #43221 (SimpleXML adding default namespace in addAttribute). (Rob) - Fixed bug #43216 (stream_is_local() returns false on file://). (Dmitry) - Fixed bug #43201 (Crash on using unitialized vals and __get/__set). (Dmitry) - Fixed bug #43182 (file_put_contents() LOCK_EX does not work properly on file -- 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
zoe Mon Nov 12 21:16:27 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
MFH: Changing the regex for %f so the it will match E-, E+ and E.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35r2=1.226.2.37.2.36diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35
php-src/run-tests.php:1.226.2.37.2.36
--- php-src/run-tests.php:1.226.2.37.2.35 Fri Sep 14 15:28:03 2007
+++ php-src/run-tests.php Mon Nov 12 21:16:27 2007
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35 2007/09/14 15:28:03 nlopess Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.36 2007/11/12 21:16:27 zoe 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
@@ -399,7 +399,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35
$'.\n;
+ echo '$Revision: 1.226.2.37.2.36
$'.\n;
exit(1);
case 'u':
@@ -1493,7 +1493,7 @@
$wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re);
$wanted_re = str_replace('%d', '\d+', $wanted_re);
$wanted_re = str_replace('%x', '[0-9a-fA-F]+',
$wanted_re);
- $wanted_re = str_replace('%f',
'[+-]?\.?\d+\.?\d*(?:E-?\d+)?', $wanted_re);
+ $wanted_re = str_replace('%f',
'[+-]?\.?\d+\.?\d*(?:E[+-]?\d+)?', $wanted_re);
$wanted_re = str_replace('%c', '.', $wanted_re);
// %f allows two points -.0.0 but that is the best
*simple* expression
}
--
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) /ext/standard file.c /main/streams plain_wrapper.c
Hi Ilia,
+ char mode[3] = wb;
+ if (flags PHP_FILE_APPEND) {
+ mode[0] = 'a';
+ } else if (flags LOCK_EX) {
+ mode[0] = 'c';
uhm, I think this assignment isn't needed, as the variable should already
contain the '\0' from the initilization above.
+ mode[2] = '\0';
probably you meant == 'c' here
+ if (mode[0] = 'c') {
+ php_stream_truncate_set_size(stream, 0);
+ }
Nuno
--
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) /ext/standard/tests/array
These tests fail on Linux 64bit: ext/standard/tests/array/krsort_variation3.phpt ext/standard/tests/array/ksort_variation3.phpt ..as well as already mentioned.. ext/standard/tests/strings/strcspn_variation3.phpt ext/standard/tests/strings/strspn_variation3.phpt ext/standard/tests/strings/strspn_variation4.phpt -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
