[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Aug 17 01:32:22 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3140r2=1.3141diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3140 php-src/ChangeLog:1.3141 --- php-src/ChangeLog:1.3140Sat Aug 16 01:32:28 2008 +++ php-src/ChangeLog Sun Aug 17 01:32:21 2008 @@ -1,3 +1,68 @@ +2008-08-16 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/string.c + ext/standard/tests/strings/setlocale_error.phpt + ext/standard/tests/strings/strtok_error.phpt + ext/standard/tests/strings/strtok_variation1.phpt + ext/standard/tests/strings/strtok_variation2.phpt: + - New parameter parsing API (zend_get_parameters_array_ex--) + - Fixed tests + +* ext/standard/string.c + ext/standard/tests/strings/addslashes_error.phpt + ext/standard/tests/strings/addslashes_variation1.phpt + ext/standard/tests/strings/strtr_error.phpt + ext/standard/tests/strings/strtr_variation5.phpt + ext/standard/tests/strings/strtr_variation7.phpt + ext/standard/tests/strings/strtr_variation9.phpt: + - New parameter parsing API + - Fixed tests + +2008-08-16 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/tests/file/popen_pclose_error-win32-debug.phpt + ext/standard/tests/file/popen_pclose_error-win32.phpt: + - MFH: remove confusion for non windows/linux users + +* ext/standard/tests/file/popen_pclose_error-win32-debug.phpt + ext/standard/tests/file/popen_pclose_error-win32.phpt: + - remove confusion for non windows/linux users + +2008-08-16 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/basic_functions.c: + Fix arginfo + +* (PHP_5_3) + NEWS + ext/standard/basic_functions.c + ext/standard/streamsfuncs.c + ext/standard/streamsfuncs.h: + MFH: [DOC] Added stream_context_set_default() function. (Davey Shafik) + +* ext/standard/basic_functions.c + ext/standard/streamsfuncs.c + ext/standard/streamsfuncs.h: + Added stream_context_set_default() function. (Davey Shafik) + +2008-08-16 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/standard/tests/file/popen_pclose_error-win32-debug.phpt: + - MFB: wrong file commited (and fix test, thx Tony for the head up) + +* (PHP_5_3) + ext/standard/tests/file/popen_pclose_error-win32-debug.phpt: + - wrong file commited (and fix test, thx Tony for the head up) + +2008-08-16 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ext/phar/tests/phar_buildfromiterator10.phpt: + fix test + 2008-08-15 Felipe Pena [EMAIL PROTECTED] * ext/xmlrpc/xmlrpc-epi-php.c: @@ -2397,7 +2462,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3140 2008/08/16 01:32:28 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3141 2008/08/17 01:32:21 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file popen_pclose_error-win32-debug.phpt popen_pclose_error-win32.phpt
There is something wrong with this SKIPIF section.
On 15.08.2008 23:01, Pierre-Alain Joye wrote:
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
+++ php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
--TEST--
Test popen() and pclose function: error conditions
--SKIPIF--
?php
if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG)) die(skip Not Valid for Linux);
There is a parse error in this line (see ))).
Also I don't get why it's not valid only for debug builds.
And btw Windows and Linux are not the only two systems we support.
if(!PHP_DEBUG) die(skip Not Valid for release builds);
if (!(strpos('MSVC9', $inf) || strpos('MSVC8', $inf))) die(skip Not Valid for build
done with VC 8);
And this is the weirdest part of all.
Where does this $inf come from?
--
Wbr,
Antony Dovgal
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests/zip corrupt_010.phpt /ext/phar/tests/zip/files corrupt3.php.inc corrupt_zipmaker.php.inc disknumber.zip extralen_toolong.zip
On 12.08.2008 02:43, Greg Beaver wrote: cellog Mon Aug 11 22:43:02 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/phar/tests/zip corrupt_010.phpt /php-src/ext/phar/tests/zip/files disknumber.zip Modified files: /php-src/ext/phar/tests/zip/files corrupt3.php.inc corrupt_zipmaker.php.inc extralen_toolong.zip Log: increase code coverage MFB? -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests phar_buildfromiterator10.phpt
tony2001Sat Aug 16 10:48:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/tests phar_buildfromiterator10.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phar_buildfromiterator10.phpt?r1=1.4.2.1r2=1.4.2.2diff_format=u
Index: php-src/ext/phar/tests/phar_buildfromiterator10.phpt
diff -u php-src/ext/phar/tests/phar_buildfromiterator10.phpt:1.4.2.1
php-src/ext/phar/tests/phar_buildfromiterator10.phpt:1.4.2.2
--- php-src/ext/phar/tests/phar_buildfromiterator10.phpt:1.4.2.1Fri Aug
1 13:38:47 2008
+++ php-src/ext/phar/tests/phar_buildfromiterator10.phptSat Aug 16
10:48:29 2008
@@ -30,7 +30,7 @@
__HALT_COMPILER();
?
--EXPECTF--
-array(33) {
+array(35) {
[phar_ctx_001.phpt]=
string(%d) %sphar_ctx_001.phpt
[phar_get_supported_signatures_001.phpt]=
@@ -97,5 +97,9 @@
string(%d) %szip%ccorrupt_007.phpt
[zip/corrupt_008.phpt]=
string(%d) %szip%ccorrupt_008.phpt
+ [zip/corrupt_009.phpt]=
+ string(%d) %szip%ccorrupt_009.phpt
+ [zip/corrupt_010.phpt]=
+ string(%d) %szip%ccorrupt_010.phpt
}
===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/file popen_pclose_error-win32-debug.phpt
pajoye Sat Aug 16 10:54:17 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file
popen_pclose_error-win32-debug.phpt
Log:
- wrong file commited (and fix test, thx Tony for the head up)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
diff -u
php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.1.2.2
php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.1.2.2
Fri Aug 15 19:01:42 2008
+++ php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt Sat Aug
16 10:54:17 2008
@@ -3,9 +3,11 @@
--SKIPIF--
?php
-if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG)) die(skip Not Valid for
Linux);
+if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG) die(skip Not Valid for Linux);
if(!PHP_DEBUG) die(skip Not Valid for release builds);
-if (!(strpos('MSVC9', $inf) || strpos('MSVC8', $inf))) die(skip Not Valid for
build done with VC 8);
+
+ob_start();phpinfo(INFO_GENERAL);$inf=ob_get_contents(); ob_end_clean();
+if (!(strpos($inf, 'MSVC9') || strpos($inf, 'MSVC8'))) die(skip Not Valid for
build done with VC 8);
?
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file popen_pclose_error-win32-debug.phpt
pajoye Sat Aug 16 10:54:34 2008 UTC
Modified files:
/php-src/ext/standard/tests/file
popen_pclose_error-win32-debug.phpt
Log:
- MFB: wrong file commited (and fix test, thx Tony for the head up)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt
diff -u php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.1
php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.2
--- php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.1
Fri Aug 15 19:01:09 2008
+++ php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt Sat Aug
16 10:54:34 2008
@@ -3,9 +3,10 @@
--SKIPIF--
?php
-if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG)) die(skip Not Valid for
Linux);
+if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG) die(skip Not Valid for Linux);
if(!PHP_DEBUG) die(skip Not Valid for release builds);
-if (!(strpos('MSVC9', $inf) || strpos('MSVC8', $inf))) die(skip Not Valid for
build done with VC 8);
+ob_start();phpinfo(INFO_GENERAL);$inf=ob_get_contents(); ob_end_clean();
+if (!(strpos($inf, 'MSVC9') || strpos($inf, 'MSVC8'))) die(skip Not Valid for
build done with VC 8);
?
--FILE--
--
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/tests/file popen_pclose_error-win32-debug.phpt popen_pclose_error-win32.phpt
hi Tony, On Sat, Aug 16, 2008 at 12:28 PM, Antony Dovgal [EMAIL PROTECTED] wrote: There is something wrong with this SKIPIF section. On 15.08.2008 23:01, Pierre-Alain Joye wrote: http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt +++ php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt --TEST-- Test popen() and pclose function: error conditions --SKIPIF-- ?php if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG)) die(skip Not Valid for Linux); There is a parse error in this line (see ))). Sorry, commited from the wrong tree, fixed now. Also I don't get why it's not valid only for debug builds. We have extra warning in debug mode on Windows (CRT warning printed out as warning), see dummy_invalid_parameter_handler in main/main.c And btw Windows and Linux are not the only two systems we support. And? These tests are for windows and also improve portability across OSes. Are you asking me to work on other OSes as well? Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h
bjori Sat Aug 16 10:57:26 2008 UTC
Modified files:
/php-src/ext/standard basic_functions.c streamsfuncs.c
streamsfuncs.h
Log:
Added stream_context_set_default() function. (Davey Shafik)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.917r2=1.918diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.917
php-src/ext/standard/basic_functions.c:1.918
--- php-src/ext/standard/basic_functions.c:1.917Thu Aug 14 10:11:26 2008
+++ php-src/ext/standard/basic_functions.c Sat Aug 16 10:57:26 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.917 2008/08/14 10:11:26 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.918 2008/08/16 10:57:26 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -2381,6 +2381,11 @@
ZEND_END_ARG_INFO()
static
+ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_default, 0)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_create, 0, 0, 0)
ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */
ZEND_ARG_INFO(0, params) /* ARRAY_INFO(0, params, 1) */
@@ -3553,6 +3558,7 @@
PHP_FE(stream_context_set_option,
arginfo_stream_context_set_option)
PHP_FE(stream_context_get_options,
arginfo_stream_context_get_options)
PHP_FE(stream_context_get_default,
arginfo_stream_context_get_default)
+ PHP_FE(stream_context_set_default,
arginfo_stream_context_set_default)
PHP_FE(stream_filter_prepend,
arginfo_stream_filter_prepend)
PHP_FE(stream_filter_append,
arginfo_stream_filter_append)
PHP_FE(stream_filter_remove,
arginfo_stream_filter_remove)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.120r2=1.121diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.120
php-src/ext/standard/streamsfuncs.c:1.121
--- php-src/ext/standard/streamsfuncs.c:1.120 Wed Jul 23 11:24:35 2008
+++ php-src/ext/standard/streamsfuncs.c Sat Aug 16 10:57:26 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.120 2008/07/23 11:24:35 tony2001 Exp $ */
+/* $Id: streamsfuncs.c,v 1.121 2008/08/16 10:57:26 bjori Exp $ */
#include php.h
#include php_globals.h
@@ -1158,6 +1158,28 @@
}
/* }}} */
+/* {{{ proto resource stream_context_set_default(array options) U
+ Set default file/stream context, returns the context as a resource */
+PHP_FUNCTION(stream_context_set_default)
+{
+ zval *options = NULL;
+ php_stream_context *context;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, a, options) ==
FAILURE) {
+ return;
+ }
+
+ if (FG(default_context) == NULL) {
+ FG(default_context) = php_stream_context_alloc();
+ }
+ context = FG(default_context);
+
+ parse_context_options(context, options TSRMLS_CC);
+
+ php_stream_context_to_zval(context, return_value);
+}
+/* }}} */
+
/* {{{ proto resource stream_context_create([array options[, array params]]) U
Create a file context and optionally set parameters */
PHP_FUNCTION(stream_context_create)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.h?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/standard/streamsfuncs.h
diff -u php-src/ext/standard/streamsfuncs.h:1.22
php-src/ext/standard/streamsfuncs.h:1.23
--- php-src/ext/standard/streamsfuncs.h:1.22Mon Dec 31 07:12:16 2007
+++ php-src/ext/standard/streamsfuncs.h Sat Aug 16 10:57:26 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: streamsfuncs.h,v 1.22 2007/12/31 07:12:16 sebastian Exp $ */
+/* $Id: streamsfuncs.h,v 1.23 2008/08/16 10:57:26 bjori Exp $ */
/* Flags for stream_socket_client */
#define PHP_STREAM_CLIENT_PERSISTENT 1
@@ -49,6 +49,7 @@
PHP_FUNCTION(stream_context_set_option);
PHP_FUNCTION(stream_context_get_options);
PHP_FUNCTION(stream_context_get_default);
+PHP_FUNCTION(stream_context_set_default);
PHP_FUNCTION(stream_filter_prepend);
PHP_FUNCTION(stream_filter_append);
PHP_FUNCTION(stream_filter_remove);
--
PHP CVS Mailing List
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS /ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h
bjori Sat Aug 16 10:57:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/php-src/ext/standard basic_functions.c streamsfuncs.c
streamsfuncs.h
Log:
MFH: [DOC] Added stream_context_set_default() function. (Davey Shafik)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.271r2=1.2027.2.547.2.965.2.272diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.271
php-src/NEWS:1.2027.2.547.2.965.2.272
--- php-src/NEWS:1.2027.2.547.2.965.2.271 Fri Aug 15 19:31:04 2008
+++ php-src/NEWSSat Aug 16 10:57:54 2008
@@ -12,6 +12,7 @@
- Added litespeed SAPI module. (George Wang)
- Added ext/hash support to ext/session's ID generator. (Sara)
- Added quoted_printable_encode() function. (Tony)
+- Added stream_context_set_default() function. (Davey Shafik)
- Added optional is_xhtml parameter to nl2br() which makes the function
output br when false and br / when true (FR #34381). (Kalle)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.50r2=1.725.2.31.2.64.2.51diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.50
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.51
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.50 Thu Aug 14
10:12:19 2008
+++ php-src/ext/standard/basic_functions.c Sat Aug 16 10:57:56 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.50 2008/08/14 10:12:19 tony2001
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.51 2008/08/16 10:57:56 bjori Exp
$ */
#include php.h
#include php_streams.h
@@ -2396,6 +2396,11 @@
ZEND_END_ARG_INFO()
static
+ZEND_BEGIN_ARG_INFO(arginfo_stream_context_set_default, 0)
+ ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_create, 0, 0, 0)
ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */
ZEND_END_ARG_INFO()
@@ -3520,6 +3525,7 @@
PHP_FE(stream_context_set_option,
arginfo_stream_context_set_option)
PHP_FE(stream_context_get_options,
arginfo_stream_context_get_options)
PHP_FE(stream_context_get_default,
arginfo_stream_context_get_default)
+ PHP_FE(stream_context_set_default,
arginfo_stream_context_set_default)
PHP_FE(stream_filter_prepend,
arginfo_stream_filter_prepend)
PHP_FE(stream_filter_append,
arginfo_stream_filter_append)
PHP_FE(stream_filter_remove,
arginfo_stream_filter_remove)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.19r2=1.58.2.6.2.15.2.20diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.19
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.20
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.19 Wed Jul 23
11:25:14 2008
+++ php-src/ext/standard/streamsfuncs.c Sat Aug 16 10:57:56 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.19 2008/07/23 11:25:14 tony2001 Exp $
*/
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.20 2008/08/16 10:57:56 bjori Exp $ */
#include php.h
#include php_globals.h
@@ -1047,6 +1047,28 @@
}
/* }}} */
+/* {{{ proto resource stream_context_set_default(array options)
+ Set default file/stream context, returns the context as a resource */
+PHP_FUNCTION(stream_context_set_default)
+{
+ zval *options = NULL;
+ php_stream_context *context;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, a, options) ==
FAILURE) {
+ return;
+ }
+
+ if (FG(default_context) == NULL) {
+ FG(default_context) = php_stream_context_alloc();
+ }
+ context = FG(default_context);
+
+ parse_context_options(context, options TSRMLS_CC);
+
+ php_stream_context_to_zval(context, return_value);
+}
+/* }}} */
+
/* {{{ proto resource stream_context_create([array options[, array params]])
Create a file context and optionally set parameters */
PHP_FUNCTION(stream_context_create)
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c
bjori Sat Aug 16 11:11:46 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard basic_functions.c Log: Fix arginfo # Yes Jani, it is correct in HEAD :) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.51r2=1.725.2.31.2.64.2.52diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.51 php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.52 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.51 Sat Aug 16 10:57:56 2008 +++ php-src/ext/standard/basic_functions.c Sat Aug 16 11:11:46 2008 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.51 2008/08/16 10:57:56 bjori Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.52 2008/08/16 11:11:46 bjori Exp $ */ #include php.h #include php_streams.h @@ -2403,6 +2403,7 @@ static ZEND_BEGIN_ARG_INFO_EX(arginfo_stream_context_create, 0, 0, 0) ZEND_ARG_INFO(0, options) /* ARRAY_INFO(0, options, 1) */ + ZEND_ARG_INFO(0, params) /* ARRAY_INFO(0, params, 1) */ ZEND_END_ARG_INFO() static -- 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/tests/file popen_pclose_error-win32-debug.phpt popen_pclose_error-win32.phpt
On 16.08.2008 14:57, Pierre Joye wrote: And btw Windows and Linux are not the only two systems we support. And? These tests are for windows and also improve portability across OSes. Are you asking me to work on other OSes as well? And saying not valid for Linux when running the test on FreeBSD is kinda odd. Hence I'd recommend using for windows only instead of not for linux. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file popen_pclose_error-win32-debug.phpt popen_pclose_error-win32.phpt
On Sat, Aug 16, 2008 at 12:57, Pierre Joye [EMAIL PROTECTED] wrote: if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG)) die(skip Not Valid for Linux); And btw Windows and Linux are not the only two systems we support. And? These tests are for windows and also improve portability across OSes. Are you asking me to work on other OSes as well? No. But If I run this test on BSD, AIX.. I will get SKIP: Not valid for linux, wtf? I'm not on Linux... :) -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file popen_pclose_error-win32-debug.phpt
pajoye Sat Aug 16 13:23:50 2008 UTC Modified files: /php-src/ext/standard/tests/file popen_pclose_error-win32-debug.phpt Log: - remove confusion for non windows/linux users http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt diff -u php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.2 php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.3 --- php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt:1.2 Sat Aug 16 10:54:34 2008 +++ php-src/ext/standard/tests/file/popen_pclose_error-win32-debug.phpt Sat Aug 16 13:23:49 2008 @@ -3,7 +3,7 @@ --SKIPIF-- ?php -if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG) die(skip Not Valid for Linux); +if(substr(PHP_OS, 0, 3) != 'WIN' PHP_DEBUG) die(skip Valid only on Windows); if(!PHP_DEBUG) die(skip Not Valid for release builds); ob_start();phpinfo(INFO_GENERAL);$inf=ob_get_contents(); ob_end_clean(); if (!(strpos($inf, 'MSVC9') || strpos($inf, 'MSVC8'))) die(skip Not Valid for build done with VC 8); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file popen_pclose_error-win32.phpt
pajoye Sat Aug 16 13:27:19 2008 UTC
Modified files:
/php-src/ext/standard/tests/filepopen_pclose_error-win32.phpt
Log:
- remove confusion for non windows/linux users
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt
diff -u php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.4
php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.5
--- php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt:1.4 Fri Aug
15 19:01:09 2008
+++ php-src/ext/standard/tests/file/popen_pclose_error-win32.phpt Sat Aug
16 13:27:18 2008
@@ -3,9 +3,7 @@
--SKIPIF--
?php
-ob_start();phpinfo(INFO_GENERAL);$inf=ob_get_contents(); ob_end_clean();
-if (strpos('MSVC9', $inf) || strpos('MSVC8', $inf)) die(skip Not Valid for
build done with VC 8);
-if(substr(PHP_OS, 0, 3) != 'WIN' ) die(skip Not Valid for Linux);
+if(substr(PHP_OS, 0, 3) != 'WIN' ) die(skip Valid only on Windows);
if(PHP_DEBUG) die(skip Not Valid for debug builds);
?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/hash CREDITS config.m4 hash.c /ext/hash/tests mhash_001.phpt mhash_002.phpt mhash_003.phpt skip_mhash.inc /ext/mhash config.m4 mhash.c mhash.dsp php_mhash.h /ext/mhash/
2008/6/28 Scott MacVicar [EMAIL PROTECTED]: scottmacSat Jun 28 15:20:49 2008 UTC Removed files: /php-src/ext/mhash mhash.dsp /php-src/ext/mhash/tests001.phpt 002.phpt 003.phpt skip.inc Modified files: /php-src/ext/hash CREDITS config.m4 hash.c /php-src/ext/hash/tests mhash_001.phpt mhash_002.phpt mhash_003.phpt skip_mhash.inc /php-src/ext/mhash config.m4 mhash.c php_mhash.h Log: MFB: Make the old mhash API a wrapper around hash, this removes a dependency. +++ php-src/ext/hash/config.m4 Sat Jun 28 15:20:49 2008 @@ -1,9 +1,17 @@ -dnl $Id: config.m4,v 1.12 2007/07/03 17:24:36 sniper Exp $ +dnl $Id: config.m4,v 1.13 2008/06/28 15:20:49 scottmac Exp $ dnl config.m4 for extension hash PHP_ARG_ENABLE(hash, whether to enable hash support, [ --disable-hash Disable hash support], yes) +if test $PHP_MHASH != no; then + if test $PHP_HASH == no; then +PHP_HASH=yes + fi + + AC_DEFINE(PHP_MHASH_BC, 1, [ ]) +fi + Will $PHP_MHASH ever be anything here? afaict ext/hash cannot be disabled after this change -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings addslashes_error.phpt addslashes_variation1.phpt strtr_error.phpt strtr_variation5.phpt strtr_variation7.phpt strtr_variation
felipe Sat Aug 16 21:16:25 2008 UTC
Modified files:
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings addslashes_error.phpt
addslashes_variation1.phpt
strtr_error.phpt
strtr_variation5.phpt
strtr_variation7.phpt
strtr_variation9.phpt
Log:
- New parameter parsing API
- Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.680r2=1.681diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.680 php-src/ext/standard/string.c:1.681
--- php-src/ext/standard/string.c:1.680 Thu Aug 14 10:10:56 2008
+++ php-src/ext/standard/string.c Sat Aug 16 21:16:24 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.680 2008/08/14 10:10:56 tony2001 Exp $ */
+/* $Id: string.c,v 1.681 2008/08/16 21:16:24 felipe Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1416,24 +1416,19 @@
Joins array elements placing glue string between items and return one
string */
PHP_FUNCTION(implode)
{
- zval**arg1 = NULL, **arg2 = NULL;
- zval*delim, *arr;
- int argc = ZEND_NUM_ARGS();
-
- if (argc 1 || argc 2) {
- WRONG_PARAM_COUNT;
- }
- if (zend_get_parameters_ex(argc, arg1, arg2) == FAILURE) {
+ zval **arg1 = NULL, **arg2 = NULL, *delim, *arr;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z|Z, arg1,
arg2) == FAILURE) {
return;
}
- if (argc == 1) {
+ if (ZEND_NUM_ARGS() == 1) {
if (Z_TYPE_PP(arg1) != IS_ARRAY) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Argument
must be an array);
return;
} else {
SEPARATE_ZVAL(arg1);
- arr = *arg1;
+ arr = *arg1;
MAKE_STD_ZVAL(delim);
if (UG(unicode)) {
ZVAL_UNICODEL(delim, EMPTY_STR, sizeof()-1,
0);
@@ -1464,7 +1459,7 @@
php_implode(delim, arr, return_value TSRMLS_CC);
- if (argc == 1) {
+ if (ZEND_NUM_ARGS() == 1) {
FREE_ZVAL(delim);
}
}
@@ -1509,15 +1504,12 @@
MAKE_STD_ZVAL(zv);
if (str_type == IS_UNICODE) {
ZVAL_UNICODEL(zv, (UChar *)str, str_len, 1);
- } else {
- ZVAL_STRINGL(zv, (char *)str, str_len, 1);
- }
- BG(strtok_zval) = zv;
- if (str_type == IS_UNICODE) {
BG(strtok_last) = BG(strtok_string) =
Z_USTRVAL_P(zv);
} else {
+ ZVAL_STRINGL(zv, (char *)str, str_len, 1);
BG(strtok_last) = BG(strtok_string) =
Z_STRVAL_P(zv);
}
+ BG(strtok_zval) = zv;
BG(strtok_len) = str_len;
break;
}
@@ -3631,19 +3623,18 @@
Returns the codepoint value of a character */
PHP_FUNCTION(ord)
{
- zval **str;
+ zstr str;
+ int str_len;
+ zend_uchar str_type;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, str) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, t, str,
str_len, str_type) == FAILURE) {
+ return;
}
- if (Z_TYPE_PP(str) != IS_UNICODE Z_TYPE_PP(str) != IS_STRING) {
- convert_to_text_ex(str);
- }
- if (Z_TYPE_PP(str) == IS_UNICODE) {
- RETURN_LONG(zend_get_codepoint_at(Z_USTRVAL_PP(str),
Z_USTRLEN_PP(str), 0));
+ if (str_type == IS_UNICODE) {
+ RETURN_LONG(zend_get_codepoint_at(str.u, str_len, 0));
} else {
- RETURN_LONG((unsigned char) Z_STRVAL_PP(str)[0]);
+ RETURN_LONG((unsigned char) str.s[0]);
}
}
/* }}} */
@@ -3652,26 +3643,25 @@
Converts a codepoint number to a character */
PHP_FUNCTION(chr)
{
- zval **num;
+ long num;
char temp[2];
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, num) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, l, num) ==
FAILURE) {
+ return;
}
- convert_to_long_ex(num);
if (UG(unicode)) {
UChar buf[2];
int buf_len;
- if (Z_LVAL_PP(num) UCHAR_MAX_VALUE) {
+ if (num UCHAR_MAX_VALUE)
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard string.c /ext/standard/tests/strings setlocale_error.phpt strtok_error.phpt strtok_variation1.phpt strtok_variation2.phpt
felipe Sat Aug 16 21:32:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings setlocale_error.phpt
strtok_error.phpt
strtok_variation1.phpt
strtok_variation2.phpt
Log:
- New parameter parsing API (zend_get_parameters_array_ex--)
- Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69.2.34r2=1.445.2.14.2.69.2.35diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69.2.34
php-src/ext/standard/string.c:1.445.2.14.2.69.2.35
--- php-src/ext/standard/string.c:1.445.2.14.2.69.2.34 Thu Aug 14 02:56:23 2008
+++ php-src/ext/standard/string.c Sat Aug 16 21:32:41 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.69.2.34 2008/08/14 02:56:23 kalle Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.35 2008/08/16 21:32:41 felipe Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1177,38 +1177,34 @@
/* {{{ proto string strtok([string str,] string token)
Tokenize a string */
PHP_FUNCTION(strtok)
-{
- zval **args[2];
- zval **tok, **str;
+{
+ char *str, *tok = NULL;
+ int str_len, tok_len = 0;
+ zval *zv;
+
char *token;
char *token_end;
char *p;
char *pe;
int skipped = 0;
- if (ZEND_NUM_ARGS() 1 || ZEND_NUM_ARGS() 2 ||
zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args) == FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s|s, str,
str_len, tok, tok_len) == FAILURE) {
+ return;
}
-
- switch (ZEND_NUM_ARGS()) {
- case 1:
- tok = args[0];
- break;
- default:
- case 2:
- str = args[0];
- tok = args[1];
- convert_to_string_ex(str);
-
- zval_add_ref(str);
- if (BG(strtok_zval)) {
- zval_ptr_dtor(BG(strtok_zval));
- }
- BG(strtok_zval) = *str;
- BG(strtok_last) = BG(strtok_string) = Z_STRVAL_PP(str);
- BG(strtok_len) = Z_STRLEN_PP(str);
- break;
+ if (ZEND_NUM_ARGS() == 1) {
+ tok = str;
+ tok_len = str_len;
+ } else {
+ if (BG(strtok_zval)) {
+ zval_ptr_dtor(BG(strtok_zval));
+ }
+ MAKE_STD_ZVAL(zv);
+ ZVAL_STRINGL(zv, str, str_len, 1);
+
+ BG(strtok_zval) = zv;
+ BG(strtok_last) = BG(strtok_string) = Z_STRVAL_P(zv);
+ BG(strtok_len) = str_len;
}
p = BG(strtok_last); /* Where we start to search */
@@ -1217,11 +1213,9 @@
if (!p || p = pe) {
RETURN_FALSE;
}
-
- convert_to_string_ex(tok);
- token = Z_STRVAL_PP(tok);
- token_end = token + Z_STRLEN_PP(tok);
+ token = tok;
+ token_end = token + tok_len;
while (token token_end) {
STRTOK_TABLE(token++) = 1;
@@ -1256,7 +1250,7 @@
/* Restore table -- usually faster then memset'ing the table on every
invocation */
restore:
- token = Z_STRVAL_PP(tok);
+ token = tok;
while (token token_end) {
STRTOK_TABLE(token++) = 0;
@@ -4001,61 +3995,64 @@
Set locale information */
PHP_FUNCTION(setlocale)
{
- zval ***args = (zval ***) safe_emalloc(sizeof(zval **),
ZEND_NUM_ARGS(), 0);
+ zval ***args = NULL;
zval **pcategory, **plocale;
- int i, cat, n_args=ZEND_NUM_ARGS();
+ int num_args, cat, i = 0;
char *loc, *retval;
- if (zend_get_parameters_array_ex(n_args, args) == FAILURE || n_args
2) {
- efree(args);
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, Z+, pcategory,
args, num_args) == FAILURE) {
+ return;
}
+
#ifdef HAVE_SETLOCALE
- pcategory = args[0];
if (Z_TYPE_PP(pcategory) == IS_LONG) {
convert_to_long_ex(pcategory);
cat = Z_LVAL_PP(pcategory);
- } else { /* FIXME: The following behaviour should be removed. */
+ } else {
+ /* FIXME: The following behaviour should be removed. */
char *category;
+
php_error_docref(NULL TSRMLS_CC, E_DEPRECATED, Passing locale
category name as string is deprecated. Use the LC_* -constants instead);
Re: [PHP-CVS] cvs: php-src /ext/hash CREDITS config.m4 hash.c /ext/hash/tests mhash_001.phpt mhash_002.phpt mhash_003.phpt skip_mhash.inc /ext/mhash config.m4 mhash.c mhash.dsp php_mhash.h /ext/mhash/
Hannes Magnusson kirjoitti: 2008/6/28 Scott MacVicar [EMAIL PROTECTED]: scottmacSat Jun 28 15:20:49 2008 UTC Removed files: /php-src/ext/mhash mhash.dsp /php-src/ext/mhash/tests001.phpt 002.phpt 003.phpt skip.inc Modified files: /php-src/ext/hash CREDITS config.m4 hash.c /php-src/ext/hash/tests mhash_001.phpt mhash_002.phpt mhash_003.phpt skip_mhash.inc /php-src/ext/mhash config.m4 mhash.c php_mhash.h Log: MFB: Make the old mhash API a wrapper around hash, this removes a dependency. +++ php-src/ext/hash/config.m4 Sat Jun 28 15:20:49 2008 @@ -1,9 +1,17 @@ -dnl $Id: config.m4,v 1.12 2007/07/03 17:24:36 sniper Exp $ +dnl $Id: config.m4,v 1.13 2008/06/28 15:20:49 scottmac Exp $ dnl config.m4 for extension hash PHP_ARG_ENABLE(hash, whether to enable hash support, [ --disable-hash Disable hash support], yes) +if test $PHP_MHASH != no; then + if test $PHP_HASH == no; then +PHP_HASH=yes + fi + + AC_DEFINE(PHP_MHASH_BC, 1, [ ]) +fi + Will $PHP_MHASH ever be anything here? afaict ext/hash cannot be disabled after this change -Hannes I wasn't paying attention to this..what was done for ext/mhash/config.m4? :) And == is not correct. It's just one = in m4. Anyway, IMO, you could simply move ext/mhash/*mhash.* (.c and .h files :) to ext/hash and simply include them with the hash sources. There's really no need anymore for the extra directory. --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/hash CREDITS config.m4 hash.c /ext/hash/tests mhash_001.phpt mhash_002.phpt mhash_003.phpt skip_mhash.inc /ext/mhash config.m4 mhash.c mhash.dsp php_mhash.h /ext/mhash/
Hi,
On Sat, Aug 16, 2008 at 11:56 PM, Jani Taskinen [EMAIL PROTECTED] wrote:
Will $PHP_MHASH ever be anything here?
afaict ext/hash cannot be disabled after this change
-Hannes
I wasn't paying attention to this..what was done for ext/mhash/config.m4? :)
And == is not correct. It's just one = in m4.
Anyway, IMO, you could simply move ext/mhash/*mhash.* (.c and .h files :) to
ext/hash and simply include them with the hash sources. There's really no
need anymore for the extra directory.
The idea behind keeping mhash was to allow:
if (extension_loaded('mhash'))
I did not not test the current version but what Jani suggests should
work. You can have two extension(..) in config.* (we do it for OCI8
with oci8_11g and oci8).
Cheers,
--
Pierre
http://blog.thepimp.net | http://www.libgd.org
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/hash CREDITS config.m4 hash.c /ext/hash/tests mhash_001.phpt mhash_002.phpt mhash_003.phpt skip_mhash.inc /ext/mhash config.m4 mhash.c mhash.dsp php_mhash.h /ext/mhash/
On 16 Aug 2008, at 17:19, Pierre Joye wrote:
Hi,
On Sat, Aug 16, 2008 at 11:56 PM, Jani Taskinen
[EMAIL PROTECTED] wrote:
Will $PHP_MHASH ever be anything here?
afaict ext/hash cannot be disabled after this change
-Hannes
I wasn't paying attention to this..what was done for ext/mhash/
config.m4? :)
And == is not correct. It's just one = in m4.
Anyway, IMO, you could simply move ext/mhash/*mhash.* (.c and .h
files :) to
ext/hash and simply include them with the hash sources. There's
really no
need anymore for the extra directory.
The idea behind keeping mhash was to allow:
if (extension_loaded('mhash'))
I did not not test the current version but what Jani suggests should
work. You can have two extension(..) in config.* (we do it for OCI8
with oci8_11g and oci8).
I'm on vacation for the next week and a half with minimal access so if
someone wants to make that change its fine with me.
Scott
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
