[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Jun 19 01:31:54 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3081r2=1.3082diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3081 php-src/ChangeLog:1.3082 --- php-src/ChangeLog:1.3081Wed Jun 18 01:31:46 2008 +++ php-src/ChangeLog Thu Jun 19 01:31:53 2008 @@ -1,3 +1,238 @@ +2008-06-18 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/tests/array/each.phpt + ext/standard/tests/array/each_error.phpt + ext/standard/tests/class_object/get_class_error_001.phpt + ext/standard/tests/class_object/get_class_methods_error_001.phpt + ext/standard/tests/class_object/get_class_variation_001.phpt + ext/standard/tests/class_object/get_object_vars_error_001.phpt + ext/standard/tests/class_object/get_object_vars_variation_003.phpt + ext/standard/tests/class_object/get_parent_class_error_001.phpt + ext/standard/tests/class_object/is_a_error_001.phpt + ext/standard/tests/class_object/is_a_variation_002.phpt + ext/standard/tests/class_object/is_subclass_of_error_001.phpt + ext/standard/tests/class_object/is_subclass_of_variation_002.phpt + ext/standard/tests/class_object/method_exists_error_001.phpt + ext/standard/tests/class_object/method_exists_variation_002.phpt + ext/standard/tests/general_functions/bug41970.phpt + ext/standard/tests/strings/strcasecmp.phpt + ext/standard/tests/strings/strcmp.phpt + ext/standard/tests/strings/strlen.phpt + ext/standard/tests/strings/strncasecmp_error.phpt + ext/standard/tests/strings/strncasecmp_variation10.phpt + ext/standard/tests/strings/strncasecmp_variation11.phpt + ext/standard/tests/strings/strncasecmp_variation4.phpt + ext/standard/tests/strings/strncasecmp_variation5.phpt + ext/standard/tests/strings/strncmp_error.phpt + ext/standard/tests/strings/strncmp_variation4.phpt + ext/standard/tests/strings/strncmp_variation5.phpt: + fix tests for builtin Zend functions using new parsing API + +* (PHP_5_3) + ZendEngine2/zend_builtin_functions.c + ZendEngine2/tests/004.phpt + ZendEngine2/tests/005.phpt + ZendEngine2/tests/006.phpt + ZendEngine2/tests/007.phpt + ZendEngine2/tests/008.phpt + ZendEngine2/tests/009.phpt + ZendEngine2/tests/011.phpt + ZendEngine2/tests/015.phpt + ZendEngine2/tests/017.phpt + ZendEngine2/tests/020.phpt + ZendEngine2/tests/exception_handler_004.phpt: + Use new parameter parsing API for builtin functions + +2008-06-18 Steph Fox [EMAIL PROTECTED] + +* (PHP_5_3) + ext/phar/tests/zip/unixzip.phpt: + - inherited methods don't unixify paths along the way. Allow for it. + +* (PHP_5_3) + ext/phar/phar.c + ext/phar/tar.c + ext/phar/zip.c + ext/phar/tests/cached_manifest_1.phpt: + - Kill 10 MSVC compiler warnings due to type conflict + - Make cached manifest test platform agnostic + - Comment out zend_(init|destroy)_rsrc_list() and associated references + + +2008-06-18 Etienne Kneuss [EMAIL PROTECTED] + +* (PHP_5_3) + ext/spl/config.m4 + ext/spl/config.w32 + ext/spl/php_spl.c + ext/spl/spl_fastarray.c + ext/spl/spl_fastarray.h + ext/spl/spl_fixedarray.c + ext/spl/spl_fixedarray.h + ext/spl/tests/fastarray_001.phpt + ext/spl/tests/fastarray_002.phpt + ext/spl/tests/fastarray_003.phpt + ext/spl/tests/fastarray_004.phpt + ext/spl/tests/fastarray_005.phpt + ext/spl/tests/fastarray_006.phpt + ext/spl/tests/fastarray_007.phpt + ext/spl/tests/fastarray_008.phpt + ext/spl/tests/fastarray_009.phpt + ext/spl/tests/fastarray_010.phpt + ext/spl/tests/fastarray_011.phpt + ext/spl/tests/fastarray_012.phpt + ext/spl/tests/fastarray_013.phpt + ext/spl/tests/fastarray_014.phpt + ext/spl/tests/fastarray_015.phpt + ext/spl/tests/fixedarray_001.phpt + ext/spl/tests/fixedarray_002.phpt + ext/spl/tests/fixedarray_003.phpt + ext/spl/tests/fixedarray_004.phpt + ext/spl/tests/fixedarray_005.phpt + ext/spl/tests/fixedarray_006.phpt + ext/spl/tests/fixedarray_007.phpt + ext/spl/tests/fixedarray_008.phpt + ext/spl/tests/fixedarray_009.phpt + ext/spl/tests/fixedarray_010.phpt + ext/spl/tests/fixedarray_011.phpt + ext/spl/tests/fixedarray_012.phpt + ext/spl/tests/fixedarray_013.phpt + ext/spl/tests/fixedarray_014.phpt + ext/spl/tests/fixedarray_015.phpt: + MFH: Rename everything from SplFastArray to SplFixedArray + +* ext/spl/tests/fixedarray_001.phpt + ext/spl/tests/fixedarray_001.phpt + ext/spl/tests/fixedarray_002.phpt + ext/spl/tests/fixedarray_002.phpt + ext/spl/tests/fixedarray_003.phpt + ext/spl/tests/fixedarray_003.phpt +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Thu Jun 19 01:31:57 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1321r2=1.1322diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1321 ZendEngine2/ChangeLog:1.1322 --- ZendEngine2/ChangeLog:1.1321Mon Jun 16 01:32:35 2008 +++ ZendEngine2/ChangeLog Thu Jun 19 01:31:57 2008 @@ -1,3 +1,20 @@ +2008-06-18 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_5_3) + zend_builtin_functions.c + tests/004.phpt + tests/005.phpt + tests/006.phpt + tests/007.phpt + tests/008.phpt + tests/009.phpt + tests/011.phpt + tests/015.phpt + tests/017.phpt + tests/020.phpt + tests/exception_handler_004.phpt: + Use new parameter parsing API for builtin functions + 2008-06-15 Felipe Pena [EMAIL PROTECTED] * (PHP_5_2) @@ -24272,7 +24289,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1321 2008/06/16 01:32:35 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1322 2008/06/19 01:31:57 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -25996,7 +26013,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1321 2008/06/16 01:32:35 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1322 2008/06/19 01:31:57 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/soap php_sdl.c /ext/soap/tests/bugs bug29109.phpt multiport.phpt multiport.wsdl
dmitry Wed Jun 18 07:23:42 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/soap/tests/bugsmultiport.phpt multiport.wsdl
Modified files:
/php-src/ext/soap php_sdl.c
/php-src/ext/soap/tests/bugsbug29109.phpt
Log:
Fixed SOAP binding selection
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.11r2=1.88.2.12.2.12diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.88.2.12.2.11
php-src/ext/soap/php_sdl.c:1.88.2.12.2.12
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.11 Wed May 7 14:57:56 2008
+++ php-src/ext/soap/php_sdl.c Wed Jun 18 07:23:42 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.11 2008/05/07 14:57:56 davidc Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.12 2008/06/18 07:23:42 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -721,12 +721,12 @@
}
trav2 = trav2-next;
}
- if (!address) {
+ if (!address || tmpbinding-bindingType ==
BINDING_HTTP) {
if (has_soap_port || trav-next || i
n-1) {
efree(tmpbinding);
trav = trav-next;
continue;
- } else {
+ } else if (!address) {
soap_error0(E_ERROR, Parsing
WSDL: No address associated with port);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug29109.phpt?r1=1.1.6.1r2=1.1.6.2diff_format=u
Index: php-src/ext/soap/tests/bugs/bug29109.phpt
diff -u php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.6.1
php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.6.2
--- php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.6.1 Wed Jan 9 16:45:28 2008
+++ php-src/ext/soap/tests/bugs/bug29109.phpt Wed Jun 18 07:23:42 2008
@@ -10,11 +10,7 @@
var_dump($client-__getFunctions());
?
--EXPECT--
-array(3) {
+array(1) {
[0]=
string(53) HelloWorldResponse HelloWorld(HelloWorld $parameters)
- [1]=
- string(19) string HelloWorld()
- [2]=
- string(19) string HelloWorld()
}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/multiport.phpt
+++ php-src/ext/soap/tests/bugs/multiport.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/multiport.wsdl
+++ php-src/ext/soap/tests/bugs/multiport.wsdl
--
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 /ext/soap/tests/bugs bug29109.phpt multiport.phpt multiport.wsdl
dmitry Wed Jun 18 07:23:58 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/soap/tests/bugsmultiport.phpt multiport.wsdl
Modified files:
/php-src/ext/soap php_sdl.c
/php-src/ext/soap/tests/bugsbug29109.phpt
Log:
Fixed SOAP binding selection
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.88.2.12.2.9.2.3r2=1.88.2.12.2.9.2.4diff_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.2.3
php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.4
--- php-src/ext/soap/php_sdl.c:1.88.2.12.2.9.2.3Wed May 7 15:23:10 2008
+++ php-src/ext/soap/php_sdl.c Wed Jun 18 07:23:58 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.3 2008/05/07 15:23:10 davidc Exp $ */
+/* $Id: php_sdl.c,v 1.88.2.12.2.9.2.4 2008/06/18 07:23:58 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -722,12 +722,12 @@
}
trav2 = trav2-next;
}
- if (!address) {
+ if (!address || tmpbinding-bindingType ==
BINDING_HTTP) {
if (has_soap_port || trav-next || i
n-1) {
efree(tmpbinding);
trav = trav-next;
continue;
- } else {
+ } else if (!address) {
soap_error0(E_ERROR, Parsing
WSDL: No address associated with port);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/bug29109.phpt?r1=1.1.8.2r2=1.1.8.3diff_format=u
Index: php-src/ext/soap/tests/bugs/bug29109.phpt
diff -u php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.2
php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.3
--- php-src/ext/soap/tests/bugs/bug29109.phpt:1.1.8.2 Sat May 24 15:22:18 2008
+++ php-src/ext/soap/tests/bugs/bug29109.phpt Wed Jun 18 07:23:58 2008
@@ -10,11 +10,7 @@
var_dump($client-__getFunctions());
?
--EXPECT--
-array(3) {
+array(1) {
[0]=
string(53) HelloWorldResponse HelloWorld(HelloWorld $parameters)
- [1]=
- string(19) string HelloWorld()
- [2]=
- string(19) string HelloWorld()
}
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.phpt?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/multiport.phpt
+++ php-src/ext/soap/tests/bugs/multiport.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.wsdl?view=markuprev=1.1
Index: php-src/ext/soap/tests/bugs/multiport.wsdl
+++ php-src/ext/soap/tests/bugs/multiport.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_sdl.c /ext/soap/tests/bugs bug29109.phpt multiport.phpt multiport.wsdl
dmitry Wed Jun 18 07:24:14 2008 UTC
Modified files:
/php-src/ext/soap php_sdl.c
/php-src/ext/soap/tests/bugsmultiport.phpt multiport.wsdl
bug29109.phpt
Log:
Fixed SOAP binding selection
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_sdl.c?r1=1.112r2=1.113diff_format=u
Index: php-src/ext/soap/php_sdl.c
diff -u php-src/ext/soap/php_sdl.c:1.112 php-src/ext/soap/php_sdl.c:1.113
--- php-src/ext/soap/php_sdl.c:1.112Wed May 7 15:45:02 2008
+++ php-src/ext/soap/php_sdl.c Wed Jun 18 07:24:14 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_sdl.c,v 1.112 2008/05/07 15:45:02 davidc Exp $ */
+/* $Id: php_sdl.c,v 1.113 2008/06/18 07:24:14 dmitry Exp $ */
#include php_soap.h
#include ext/libxml/php_libxml.h
@@ -721,12 +721,12 @@
}
trav2 = trav2-next;
}
- if (!address) {
+ if (!address || tmpbinding-bindingType ==
BINDING_HTTP) {
if (has_soap_port || trav-next || i
n-1) {
efree(tmpbinding);
trav = trav-next;
continue;
- } else {
+ } else if (!address) {
soap_error0(E_ERROR, Parsing
WSDL: No address associated with port);
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/multiport.phpt
diff -u /dev/null php-src/ext/soap/tests/bugs/multiport.phpt:1.2
--- /dev/null Wed Jun 18 07:24:14 2008
+++ php-src/ext/soap/tests/bugs/multiport.phpt Wed Jun 18 07:24:14 2008
@@ -0,0 +1,16 @@
+--TEST--
+Proper binding selection
+--SKIPIF--
+?php require_once 'skipif.inc'; ?
+--INI--
+soap.wsdl_cache_enabled=0
+--FILE--
+?php
+$client = new SoapClient(dirname(__FILE__).'/multiport.wsdl',
+ array('trace' = true, 'exceptions' = false));
+$response = $client-GetSessionId(array('userId'='user',
'password'='password'));
+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=http://www.reuters.com/;SOAP-ENV:Bodyns1:GetSessionIdns1:userIduser/ns1:userIdns1:passwordpassword/ns1:password/ns1:GetSessionId/SOAP-ENV:Body/SOAP-ENV:Envelope
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/tests/bugs/multiport.wsdl?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/soap/tests/bugs/multiport.wsdl
diff -u /dev/null php-src/ext/soap/tests/bugs/multiport.wsdl:1.2
--- /dev/null Wed Jun 18 07:24:14 2008
+++ php-src/ext/soap/tests/bugs/multiport.wsdl Wed Jun 18 07:24:14 2008
@@ -0,0 +1,88 @@
+?xml version=1.0 encoding=UTF-8?
+wsdl:definitions targetNamespace=http://www.reuters.com/;
xmlns:tns=http://www.reuters.com/;
xmlns:tm=http://microsoft.com/wsdl/mime/textMatching/;
xmlns:mime=http://schemas.xmlsoap.org/wsdl/mime/;
xmlns:http=http://schemas.xmlsoap.org/wsdl/http/;
xmlns:soapenc=http://schemas.xmlsoap.org/soap/encoding/;
xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/;
xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/;
xmlns:s=http://www.w3.org/2001/XMLSchema;
+ wsdl:types
+s:schema elementFormDefault=qualified
targetNamespace=http://www.reuters.com/;
+ s:element name=GetSessionId
+s:complexType
+ s:sequence
+s:element maxOccurs=1 minOccurs=0 name=userId
type=s:string/
+s:element maxOccurs=1 minOccurs=0 name=password
type=s:string/
+ /s:sequence
+/s:complexType
+ /s:element
+ s:element name=GetSessionIdResponse
+s:complexType
+ s:sequence
+s:element maxOccurs=1 minOccurs=0 name=GetSessionIdResult
type=s:string/
+ /s:sequence
+/s:complexType
+ /s:element
+/s:schema
+ /wsdl:types
+ wsdl:message name=GetSessionIdHttpGetIn
+wsdl:part name=userId type=s:string
+/wsdl:part
+wsdl:part name=password type=s:string
+/wsdl:part
+ /wsdl:message
+ wsdl:message name=GetSessionIdHttpGetOut
+wsdl:part name=Body element=tns:string
+/wsdl:part
+ /wsdl:message
+ wsdl:message name=GetSessionIdSoapOut
+wsdl:part name=parameters element=tns:GetSessionIdResponse
+/wsdl:part
+ /wsdl:message
+ wsdl:message name=GetSessionIdSoapIn
+wsdl:part name=parameters element=tns:GetSessionId
+/wsdl:part
+ /wsdl:message
+ wsdl:portType name=StocksDataSecureHttpGet
+wsdl:operation name=GetSessionId
+
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c /ext/spl/tests bug45216.phpt
colder Wed Jun 18 10:05:15 2008 UTC
Added files:
/php-src/ext/spl/tests bug45216.phpt
Modified files:
/php-src/ext/splspl_directory.c
Log:
Fix #45216 (Add a default size for fgetss)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.155r2=1.156diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.155
php-src/ext/spl/spl_directory.c:1.156
--- php-src/ext/spl/spl_directory.c:1.155 Tue May 20 21:46:13 2008
+++ php-src/ext/spl/spl_directory.c Wed Jun 18 10:05:14 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.155 2008/05/20 21:46:13 colder Exp $ */
+/* $Id: spl_directory.c,v 1.156 2008/06/18 10:05:14 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -2427,7 +2427,12 @@
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
zval *arg2 = NULL;
MAKE_STD_ZVAL(arg2);
- ZVAL_LONG(arg2, intern-u.file.max_line_len);
+
+ if (intern-u.file.max_line_len 0) {
+ ZVAL_LONG(arg2, intern-u.file.max_line_len);
+ } else {
+ ZVAL_LONG(arg2, 1024);
+ }
spl_filesystem_file_free_line(intern TSRMLS_CC);
intern-u.file.current_line_num++;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug45216.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug45216.phpt
+++ php-src/ext/spl/tests/bug45216.phpt
--TEST--
SPL: SplFileObject::fgetss (bug 45216)
--CREDITS--
Perrick Penet [EMAIL PROTECTED]
#testfest phpcampparis 2008-06-07
--FILE--
?php
$file = dirname(__FILE__) . '/foo.html';
file_put_contents($file, 'text 0div class=testedtext 1/div');
$handle = fopen($file, 'r');
$object = new SplFileObject($file);
var_dump($object-fgetss());
var_dump(fgetss($handle));
?
--CLEAN--
?php
unlink(dirname(__FILE__) . '/foo.html');
?
--EXPECTF--
string(12) text 0text 1
string(12) text 0text 1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_directory.c /ext/spl/tests bug45216.phpt
colder Wed Jun 18 10:05:29 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests bug45216.phpt
Modified files:
/php-src/ext/splspl_directory.c
Log:
MFH: Fix #45216 (Add a default size for fgetss)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.21r2=1.45.2.27.2.23.2.22diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.21
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.22
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.21 Tue May 20 21:46:50 2008
+++ php-src/ext/spl/spl_directory.c Wed Jun 18 10:05:29 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.21 2008/05/20 21:46:50 colder Exp $
*/
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.22 2008/06/18 10:05:29 colder Exp $
*/
#ifdef HAVE_CONFIG_H
# include config.h
@@ -2295,7 +2295,12 @@
spl_filesystem_object *intern =
(spl_filesystem_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
zval *arg2 = NULL;
MAKE_STD_ZVAL(arg2);
- ZVAL_LONG(arg2, intern-u.file.max_line_len);
+
+ if (intern-u.file.max_line_len 0) {
+ ZVAL_LONG(arg2, intern-u.file.max_line_len);
+ } else {
+ ZVAL_LONG(arg2, 1024);
+ }
spl_filesystem_file_free_line(intern TSRMLS_CC);
intern-u.file.current_line_num++;
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug45216.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug45216.phpt
+++ php-src/ext/spl/tests/bug45216.phpt
--TEST--
SPL: SplFileObject::fgetss (bug 45216)
--CREDITS--
Perrick Penet [EMAIL PROTECTED]
#testfest phpcampparis 2008-06-07
--FILE--
?php
$file = dirname(__FILE__) . '/foo.html';
file_put_contents($file, 'text 0div class=testedtext 1/div');
$handle = fopen($file, 'r');
$object = new SplFileObject($file);
var_dump($object-fgetss());
var_dump(fgetss($handle));
?
--CLEAN--
?php
unlink(dirname(__FILE__) . '/foo.html');
?
--EXPECTF--
string(12) text 0text 1
string(12) text 0text 1
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar_internal.h util.c
pajoye Wed Jun 18 10:20:47 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar_internal.h util.c
Log:
- really fix the windows builds, don't cast many times when only the hash
function requires void **
- copy/paste evilness with TSRM_CC/DC
(tests still pass but would be nice to speed them up...)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_internal.h?r1=1.109.2.15r2=1.109.2.16diff_format=u
Index: php-src/ext/phar/phar_internal.h
diff -u php-src/ext/phar/phar_internal.h:1.109.2.15
php-src/ext/phar/phar_internal.h:1.109.2.16
--- php-src/ext/phar/phar_internal.h:1.109.2.15 Wed Jun 18 06:38:47 2008
+++ php-src/ext/phar/phar_internal.hWed Jun 18 10:20:47 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: phar_internal.h,v 1.109.2.15 2008/06/18 06:38:47 cellog Exp $ */
+/* $Id: phar_internal.h,v 1.109.2.16 2008/06/18 10:20:47 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -374,7 +374,7 @@
PHAR_GLOBALS-cached_fp[entry-phar-phar_pos].ufp = fp;
}
-static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_CC)
+static inline php_stream *phar_get_pharfp(phar_archive_data *phar TSRMLS_DC)
{
if (!phar-is_persistent) {
return phar-fp;
@@ -382,7 +382,7 @@
return PHAR_GLOBALS-cached_fp[phar-phar_pos].fp;
}
-static inline php_stream *phar_get_pharufp(phar_archive_data *phar TSRMLS_CC)
+static inline php_stream *phar_get_pharufp(phar_archive_data *phar TSRMLS_DC)
{
if (!phar-is_persistent) {
return phar-ufp;
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.11r2=1.55.2.12diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.11 php-src/ext/phar/util.c:1.55.2.12
--- php-src/ext/phar/util.c:1.55.2.11 Wed Jun 18 06:38:47 2008
+++ php-src/ext/phar/util.c Wed Jun 18 10:20:47 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: util.c,v 1.55.2.11 2008/06/18 06:38:47 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.12 2008/06/18 10:20:47 pajoye Exp $ */
#include phar_internal.h
#ifdef PHAR_HAVE_OPENSSL
@@ -1883,7 +1883,7 @@
*/
static int phar_add_empty(HashTable *ht, char *arKey, uint nKeyLength) /* {{{
*/
{
- void *dummy = (char *) 1;
+ char *dummy = (char*)1;
if (SUCCESS == zend_hash_find(ht, arKey, nKeyLength, (void **)dummy)) {
dummy++;
}
@@ -1912,7 +1912,7 @@
/* we use filename_len - 1 to avoid adding a virtual dir for empty
directory entries */
for (; s - filename filename_len - 1; s++) {
if (*s == '/') {
- void *dummy;
+ char *dummy;
if (FAILURE == zend_hash_find(phar-virtual_dirs,
filename, s - filename, (void **)dummy)) {
continue;
}
--
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/phar phar.c phar.phar phar_internal.h tar.c zip.c /ext/phar/tests phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.phpt phpinfo_004.phpt
Hi Greg, OK so I'm behind the times, but this commit is problematic. The request simulation broke the build under VC6 because zend_init_rsrc_list() and zend_destroy_rsrc_list() aren't actually part of the Zend API. The latter is simply a wrapper for a call to zend_hash_graceful_reverse_destroy(), which _is_ part of the Zend API, so that could easily be fixed. However it's virtually impossible to emulate zend_init_rsrc_list() in an extension, which makes me wonder if it's even safe to mess with the global regular_list? Could you please investigate? I'm about to commit some minor bits and pieces to kill the MSVC warnings that appeared in the debug build over the last week, but I can't actually build ext/phar here at present due to the linking problems caused by the above. Cheers, - Steph - Original Message - From: Greg Beaver [EMAIL PROTECTED] To: php-cvs@lists.php.net; [EMAIL PROTECTED] Sent: Thursday, June 12, 2008 7:56 PM Subject: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c phar.phar phar_internal.h tar.c zip.c /ext/phar/tests phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.phpt phpinfo_004.phpt cellog Thu Jun 12 18:56:23 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.c phar.phar phar_internal.h tar.c zip.c /php-src/ext/phar/tests phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.phpt phpinfo_004.phpt Log: [DOC] add phar.cache_list, a PATH_SEPARATOR-separated list of full paths to phar archives to cache at startup. This caches the manifest, so that on first access to a phar archive, no file manifest parsing occurs. This could use further tweaking. For instance, the full copy of the manifest into the current process may be unnecessary if refcounting could be external to the manifest. This would be another significant gain. With APC, I measure a slight perf increase to 19 req/sec up from 16 req/sec, without it approaches regular PHP at 3.8 req/sec (regular is 4 req/sec). This is benching phpMyAdmin -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.c tar.c zip.c /ext/phar/tests cached_manifest_1.phpt
sfoxWed Jun 18 15:06:50 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar phar.c tar.c zip.c /php-src/ext/phar/tests cached_manifest_1.phpt Log: - Kill 10 MSVC compiler warnings due to type conflict - Make cached manifest test platform agnostic - Comment out zend_(init|destroy)_rsrc_list() and associated references @Greg: cached manifest test (now) passes here regardless, make of that what you will http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.21r2=1.370.2.22diff_format=u Index: php-src/ext/phar/phar.c diff -u php-src/ext/phar/phar.c:1.370.2.21 php-src/ext/phar/phar.c:1.370.2.22 --- php-src/ext/phar/phar.c:1.370.2.21 Wed Jun 18 06:38:47 2008 +++ php-src/ext/phar/phar.c Wed Jun 18 15:06:50 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: phar.c,v 1.370.2.21 2008/06/18 06:38:47 cellog Exp $ */ +/* $Id: phar.c,v 1.370.2.22 2008/06/18 15:06:50 sfox Exp $ */ #define PHAR_MAIN 1 #include phar_internal.h @@ -115,7 +115,7 @@ /* fake request startup */ PHAR_GLOBALS-request_init = 1; - zend_init_rsrc_list(TSRMLS_C); + //zend_init_rsrc_list(TSRMLS_C); PHAR_G(has_bz2) = zend_hash_exists(module_registry, bz2, sizeof(bz2)); PHAR_G(has_zlib) = zend_hash_exists(module_registry, zlib, sizeof(zlib)); /* these two are dummies and will be destroyed later */ @@ -149,8 +149,8 @@ PHAR_GLOBALS-phar_alias_map.arBuckets = 0; zend_hash_destroy(cached_phars); zend_hash_destroy(cached_alias); - zend_destroy_rsrc_list(EG(regular_list) TSRMLS_CC); - memset(EG(regular_list), 0, sizeof(HashTable)); + //zend_destroy_rsrc_list(EG(regular_list) TSRMLS_CC); + //memset(EG(regular_list), 0, sizeof(HashTable)); /* free cached manifests */ PHAR_GLOBALS-request_init = 0; return; @@ -172,8 +172,8 @@ cached_alias = PHAR_GLOBALS-phar_alias_map; PHAR_GLOBALS-phar_fname_map.arBuckets = 0; PHAR_GLOBALS-phar_alias_map.arBuckets = 0; - zend_destroy_rsrc_list(EG(regular_list) TSRMLS_CC); - memset(EG(regular_list), 0, sizeof(HashTable)); + //zend_destroy_rsrc_list(EG(regular_list) TSRMLS_CC); + //memset(EG(regular_list), 0, sizeof(HashTable)); efree(tmp); } /* }}} */ @@ -976,11 +976,11 @@ /* set up our manifest */ zend_hash_init(mydata-manifest, manifest_count, - zend_get_hash_value, destroy_phar_manifest_entry, mydata-is_persistent); + zend_get_hash_value, destroy_phar_manifest_entry, (zend_bool)mydata-is_persistent); zend_hash_init(mydata-mounted_dirs, 5, - zend_get_hash_value, NULL, mydata-is_persistent); + zend_get_hash_value, NULL, (zend_bool)mydata-is_persistent); zend_hash_init(mydata-virtual_dirs, manifest_count * 2, - zend_get_hash_value, NULL, mydata-is_persistent); + zend_get_hash_value, NULL, (zend_bool)mydata-is_persistent); offset = halt_offset + manifest_len + 4; memset(entry, 0, sizeof(phar_entry_info)); entry.phar = mydata; @@ -1301,7 +1301,7 @@ zend_hash_init(mydata-mounted_dirs, sizeof(char *), zend_get_hash_value, NULL, 0); zend_hash_init(mydata-virtual_dirs, sizeof(char *), - zend_get_hash_value, NULL, mydata-is_persistent); + zend_get_hash_value, NULL, (zend_bool)mydata-is_persistent); mydata-fname_len = fname_len; snprintf(mydata-version, sizeof(mydata-version), %s, PHP_PHAR_API_VERSION); mydata-is_temporary_alias = alias ? 0 : 1; @@ -3358,7 +3358,7 @@ php_info_print_table_header(2, Phar: PHP Archive support, enabled); php_info_print_table_row(2, Phar EXT version, PHP_PHAR_VERSION); php_info_print_table_row(2, Phar API version, PHP_PHAR_API_VERSION); - php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.21 $); + php_info_print_table_row(2, CVS revision, $Revision: 1.370.2.22 $); php_info_print_table_row(2, Phar-based phar archives, enabled); php_info_print_table_row(2, Tar-based phar archives, enabled); php_info_print_table_row(2, ZIP-based phar archives, enabled); http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tar.c?r1=1.55.2.11r2=1.55.2.12diff_format=u Index: php-src/ext/phar/tar.c diff -u php-src/ext/phar/tar.c:1.55.2.11 php-src/ext/phar/tar.c:1.55.2.12 --- php-src/ext/phar/tar.c:1.55.2.11Wed Jun 18 06:38:47 2008 +++ php-src/ext/phar/tar.c Wed Jun 18 15:06:50 2008 @@ -218,11 +218,11 @@ myphar-is_persistent = PHAR_G(persist); /*
[PHP-CVS] cvs: php-src /ext/spl config.m4 config.w32 php_spl.c spl_fastarray.c spl_fastarray.h spl_fixedarray.c spl_fixedarray.h /ext/spl/tests fastarray_001.phpt fastarray_002.phpt fastarray_003.php
colder Wed Jun 18 14:54:28 2008 UTC
Added files:
/php-src/ext/splspl_fixedarray.c spl_fixedarray.h
/php-src/ext/spl/tests fixedarray_001.phpt fixedarray_002.phpt
fixedarray_003.phpt fixedarray_004.phpt
fixedarray_005.phpt fixedarray_006.phpt
fixedarray_007.phpt fixedarray_008.phpt
fixedarray_009.phpt fixedarray_010.phpt
fixedarray_011.phpt fixedarray_012.phpt
fixedarray_013.phpt fixedarray_014.phpt
fixedarray_015.phpt
Removed files:
/php-src/ext/splspl_fastarray.c spl_fastarray.h
/php-src/ext/spl/tests fastarray_001.phpt fastarray_002.phpt
fastarray_003.phpt fastarray_004.phpt
fastarray_005.phpt fastarray_006.phpt
fastarray_007.phpt fastarray_008.phpt
fastarray_009.phpt fastarray_010.phpt
fastarray_011.phpt fastarray_012.phpt
fastarray_013.phpt fastarray_014.phpt
fastarray_015.phpt
Modified files:
/php-src/ext/splconfig.m4 config.w32 php_spl.c
Log:
Rename everything from SplFastArray to SplFixedArray
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.m4?r1=1.26r2=1.27diff_format=u
Index: php-src/ext/spl/config.m4
diff -u php-src/ext/spl/config.m4:1.26 php-src/ext/spl/config.m4:1.27
--- php-src/ext/spl/config.m4:1.26 Fri Jun 6 23:53:10 2008
+++ php-src/ext/spl/config.m4 Wed Jun 18 14:54:27 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.26 2008/06/06 23:53:10 colder Exp $
+dnl $Id: config.m4,v 1.27 2008/06/18 14:54:27 colder Exp $
dnl config.m4 for extension SPL
AC_MSG_CHECKING(whether zend_object_value is packed)
@@ -25,6 +25,6 @@
PHP_INSTALL_HEADERS([ext/spl/])
AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct
_zend_object_value is packed])
AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library)
support])
- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c
spl_observer.c spl_dllist.c spl_heap.c spl_fastarray.c, no)
- PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h
spl_sxe.h spl_dllist.h spl_heap.h spl_fastarray.h])
+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c
spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no)
+ PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h
spl_sxe.h spl_dllist.h spl_heap.h spl_fixedarray.h])
PHP_ADD_EXTENSION_DEP(spl, pcre, true)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.11 php-src/ext/spl/config.w32:1.12
--- php-src/ext/spl/config.w32:1.11 Fri Jun 6 23:53:10 2008
+++ php-src/ext/spl/config.w32 Wed Jun 18 14:54:27 2008
@@ -1,5 +1,5 @@
-// $Id: config.w32,v 1.11 2008/06/06 23:53:10 colder Exp $
+// $Id: config.w32,v 1.12 2008/06/18 14:54:27 colder Exp $
// vim:ft=javascript
-EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c
spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c
spl_dllist.c spl_heap.c spl_fastarray.c, false /* never shared */);
+EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c
spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c
spl_dllist.c spl_heap.c spl_fixedarray.c, false /* never shared */);
AC_DEFINE('HAVE_SPL', 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.132r2=1.133diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.132 php-src/ext/spl/php_spl.c:1.133
--- php-src/ext/spl/php_spl.c:1.132 Fri Jun 6 23:53:10 2008
+++ php-src/ext/spl/php_spl.c Wed Jun 18 14:54:27 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.132 2008/06/06 23:53:10 colder Exp $ */
+/* $Id: php_spl.c,v 1.133 2008/06/18 14:54:27 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -37,7 +37,7 @@
#include spl_observer.h
#include spl_dllist.h
#include spl_heap.h
-#include spl_fastarray.h
+#include spl_fixedarray.h
#include zend_exceptions.h
#include zend_interfaces.h
#include ext/standard/md5.h
@@ -157,7 +157,7 @@
SPL_ADD_CLASS(SplMinHeap, z_list, sub, allow, ce_flags); \
SPL_ADD_CLASS(SplMaxHeap, z_list, sub, allow,
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl config.m4 config.w32 php_spl.c spl_fastarray.c spl_fastarray.h spl_fixedarray.c spl_fixedarray.h /ext/spl/tests fastarray_001.phpt fastarray_002.phpt fastarra
colder Wed Jun 18 14:54:40 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/splspl_fixedarray.c spl_fixedarray.h
/php-src/ext/spl/tests fixedarray_001.phpt fixedarray_002.phpt
fixedarray_003.phpt fixedarray_004.phpt
fixedarray_005.phpt fixedarray_006.phpt
fixedarray_007.phpt fixedarray_008.phpt
fixedarray_009.phpt fixedarray_010.phpt
fixedarray_011.phpt fixedarray_012.phpt
fixedarray_013.phpt fixedarray_014.phpt
fixedarray_015.phpt
Removed files:
/php-src/ext/splspl_fastarray.c spl_fastarray.h
/php-src/ext/spl/tests fastarray_001.phpt fastarray_002.phpt
fastarray_003.phpt fastarray_004.phpt
fastarray_005.phpt fastarray_006.phpt
fastarray_007.phpt fastarray_008.phpt
fastarray_009.phpt fastarray_010.phpt
fastarray_011.phpt fastarray_012.phpt
fastarray_013.phpt fastarray_014.phpt
fastarray_015.phpt
Modified files:
/php-src/ext/splconfig.m4 config.w32 php_spl.c
Log:
MFH: Rename everything from SplFastArray to SplFixedArray
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.m4?r1=1.13.2.4.2.3.2.4r2=1.13.2.4.2.3.2.5diff_format=u
Index: php-src/ext/spl/config.m4
diff -u php-src/ext/spl/config.m4:1.13.2.4.2.3.2.4
php-src/ext/spl/config.m4:1.13.2.4.2.3.2.5
--- php-src/ext/spl/config.m4:1.13.2.4.2.3.2.4 Fri Jun 6 23:53:43 2008
+++ php-src/ext/spl/config.m4 Wed Jun 18 14:54:39 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.13.2.4.2.3.2.4 2008/06/06 23:53:43 colder Exp $
+dnl $Id: config.m4,v 1.13.2.4.2.3.2.5 2008/06/18 14:54:39 colder Exp $
dnl config.m4 for extension SPL
AC_MSG_CHECKING(whether zend_object_value is packed)
@@ -22,6 +22,6 @@
CPPFLAGS=$old_CPPFLAGS
AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct
_zend_object_value is packed])
AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library)
support])
- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c
spl_observer.c spl_dllist.c spl_heap.c spl_fastarray.c, no)
- PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h
spl_sxe.h spl_dllist.h spl_heap.h spl_fastarray.h])
+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c
spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no)
+ PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h
spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h
spl_sxe.h spl_dllist.h spl_heap.h spl_fixedarray.h])
PHP_ADD_EXTENSION_DEP(spl, pcre, true)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.7.6.4r2=1.7.6.5diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.7.6.4 php-src/ext/spl/config.w32:1.7.6.5
--- php-src/ext/spl/config.w32:1.7.6.4 Fri Jun 6 23:53:43 2008
+++ php-src/ext/spl/config.w32 Wed Jun 18 14:54:39 2008
@@ -1,6 +1,6 @@
-// $Id: config.w32,v 1.7.6.4 2008/06/06 23:53:43 colder Exp $
+// $Id: config.w32,v 1.7.6.5 2008/06/18 14:54:39 colder Exp $
// vim:ft=javascript
- EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c
spl_observer.c spl_dllist.c spl_heap.c spl_fastarray.c, false /*never shared
*/);
+ EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c
spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c
spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, false /*never shared
*/);
AC_DEFINE('HAVE_SPL', 1);
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.52.2.28.2.17.2.18r2=1.52.2.28.2.17.2.19diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.18
php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.19
--- php-src/ext/spl/php_spl.c:1.52.2.28.2.17.2.18 Fri Jun 6 23:53:43 2008
+++ php-src/ext/spl/php_spl.c Wed Jun 18 14:54:39 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_spl.c,v 1.52.2.28.2.17.2.18 2008/06/06 23:53:43 colder Exp $ */
+/* $Id: php_spl.c,v 1.52.2.28.2.17.2.19 2008/06/18 14:54:39 colder Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -36,7 +36,7 @@
#include spl_exceptions.h
#include spl_observer.h
#include spl_dllist.h
-#include spl_fastarray.h
+#include
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests/zip unixzip.phpt
sfoxWed Jun 18 16:48:18 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar/tests/zip unixzip.phpt Log: - inherited methods don't unixify paths along the way. Allow for it. http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/unixzip.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u Index: php-src/ext/phar/tests/zip/unixzip.phpt diff -u php-src/ext/phar/tests/zip/unixzip.phpt:1.2.2.2 php-src/ext/phar/tests/zip/unixzip.phpt:1.2.2.3 --- php-src/ext/phar/tests/zip/unixzip.phpt:1.2.2.2 Wed Jun 4 07:38:10 2008 +++ php-src/ext/phar/tests/zip/unixzip.phpt Wed Jun 18 16:48:18 2008 @@ -20,10 +20,10 @@ ? ===DONE=== --EXPECTF-- -dir phar:///%s/zip.zip/empty -phar:///%s/zip.zip/hi.txt +dir phar://%s/zip.zip%cempty +phar://%s/zip.zip%chi.txt hi there -dir phar:///%s/zip.zip/notempty -phar:///%s/zip.zip/notempty/hi.txt +dir phar://%s/zip.zip%cnotempty +phar://%s/zip.zip/notempty/hi.txt ===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) /ext/standard/tests/array each.phpt each_error.phpt /ext/standard/tests/class_object get_class_error_001.phpt get_class_methods_error_001.phpt get_class_variation_001.
stasWed Jun 18 23:45:36 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array each.phpt each_error.phpt /php-src/ext/standard/tests/class_objectget_class_error_001.phpt get_class_methods_error_001.phpt get_class_variation_001.phpt get_object_vars_error_001.phpt get_object_vars_variation_003.phpt get_parent_class_error_001.phpt is_a_error_001.phpt is_a_variation_002.phpt is_subclass_of_error_001.phpt is_subclass_of_variation_002.phpt method_exists_error_001.phpt method_exists_variation_002.phpt /php-src/ext/standard/tests/general_functions bug41970.phpt /php-src/ext/standard/tests/strings strcasecmp.phpt strcmp.phpt strlen.phpt strncasecmp_error.phpt strncasecmp_variation10.phpt strncasecmp_variation11.phpt strncasecmp_variation4.phpt strncasecmp_variation5.phpt strncmp_error.phpt strncmp_variation4.phpt strncmp_variation5.phpt Log: fix tests for builtin Zend functions using new parsing API http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/each.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/array/each.phpt diff -u php-src/ext/standard/tests/array/each.phpt:1.1.2.1 php-src/ext/standard/tests/array/each.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/array/each.phpt:1.1.2.1 Sat May 12 09:53:30 2007 +++ php-src/ext/standard/tests/array/each.phpt Wed Jun 18 23:45:36 2008 @@ -692,10 +692,10 @@ *** Testing error conditions *** -Warning: Wrong parameter count for each() in %s on line %d +Warning: each() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Wrong parameter count for each() in %s on line %d +Warning: each() expects exactly 1 parameter, 2 given in %s on line %d NULL Warning: Variable passed to each() is not an array or object in %s on line %d http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/each_error.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/array/each_error.phpt diff -u php-src/ext/standard/tests/array/each_error.phpt:1.1.4.2 php-src/ext/standard/tests/array/each_error.phpt:1.1.4.3 --- php-src/ext/standard/tests/array/each_error.phpt:1.1.4.2Tue Feb 19 17:02:27 2008 +++ php-src/ext/standard/tests/array/each_error.phptWed Jun 18 23:45:36 2008 @@ -32,11 +32,11 @@ -- Testing each() function with Zero arguments -- -Warning: Wrong parameter count for each() in %s on line %d +Warning: each() expects exactly 1 parameter, 0 given in %s on line %d NULL -- Testing each() function with more than expected no. of arguments -- -Warning: Wrong parameter count for each() in %s on line %d +Warning: each() expects exactly 1 parameter, 2 given in %s on line %d NULL Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_error_001.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/class_object/get_class_error_001.phpt diff -u php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.1.4.2 php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.1.4.3 --- php-src/ext/standard/tests/class_object/get_class_error_001.phpt:1.1.4.2 Thu Mar 6 11:02:37 2008 +++ php-src/ext/standard/tests/class_object/get_class_error_001.phptWed Jun 18 23:45:36 2008 @@ -23,6 +23,6 @@ -- Testing get_class() function with more than expected no. of arguments -- -Warning: Wrong parameter count for get_class() in %s on line 14 +Warning: get_class() expects at most 1 parameter, 2 given in %s on line 14 NULL Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/class_object/get_class_methods_error_001.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/class_object/get_class_methods_error_001.phpt diff -u php-src/ext/standard/tests/class_object/get_class_methods_error_001.phpt:1.1.4.2 php-src/ext/standard/tests/class_object/get_class_methods_error_001.phpt:1.1.4.3 --- php-src/ext/standard/tests/class_object/get_class_methods_error_001.phpt:1.1.4.2
[PHP-CVS] cvs: CVSROOT / avail
philip Thu Jun 19 00:32:53 2008 UTC Modified files: /CVSROOTavail Log: - phpdoc-tr karma for Himmet Yelekin (yelekin) http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1412r2=1.1413diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1412 CVSROOT/avail:1.1413 --- CVSROOT/avail:1.1412Tue Jun 17 16:23:12 2008 +++ CVSROOT/avail Thu Jun 19 00:32:53 2008 @@ -78,7 +78,7 @@ avail|machado,scar,davis,dnfeitosa|phpdoc-pt_BR avail|radical,shoty|phpdoc-ro avail|freespace,shaff,sveta,wanderer,kozloffsky,santiago|phpdoc-ru -avail|cumhuronat,gulenzek,xhandros,neoprobe,faruk,infralite,flarecaster,antimon|phpdoc-tr +avail|cumhuronat,gulenzek,xhandros,neoprobe,faruk,infralite,flarecaster,antimon,yelekin|phpdoc-tr # access to the pecl website etc avail|dufuz,pajoye,wez,pollita,tal,cox,mj,helly,john,iliaa,edink,jan,derick,jon,cellog,philip,jani,johannes,sfox|peclweb,pecl -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
