[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Apr 15 01:31:36 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3017r2=1.3018diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3017 php-src/ChangeLog:1.3018 --- php-src/ChangeLog:1.3017Mon Apr 14 01:31:33 2008 +++ php-src/ChangeLog Tue Apr 15 01:31:35 2008 @@ -1,3 +1,70 @@ +2008-04-14 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/tests/array/array_slice_variation6.phpt: + + Fixed test + +2008-04-14 Steph Fox [EMAIL PROTECTED] + +* (PHP_5_3) + win32/build/confutils.js: + - Workarounds are no longer needed - thanks PECLers! + +2008-04-14 Felipe Pena [EMAIL PROTECTED] + +* ext/standard/tests/general_functions/floatval.phpt: + - Fixed test (bug #44533) + +* (PHP_5_3) + ext/libxml/tests/004.phpt + ext/standard/tests/strings/007.phpt: + - Fixed test + +2008-04-14 Etienne Kneuss [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/dns.c: + MFH: Fix dns_check_proto (related to #44723) + +* ext/standard/dns.c: + Fix dns_check_proto (related to #44723) + +2008-04-14 Hannes Magnusson [EMAIL PROTECTED] + +* ext/standard/basic_functions.c + ext/standard/tests/general_functions/ini_get_all.phpt: + MFB5.3: Remove config_get_hash() and add new boolean parameter to + ini_get_all() to list ini entries key=current_value like + config_get_hash() + did. + +* (PHP_5_3) + ext/standard/basic_functions.c + ext/standard/basic_functions.h + ext/standard/tests/general_functions/ini_get_all.phpt: + [DOC] Remove config_get_hash() and add new boolean parameter to + ini_get_all() + to list ini entries key=current_value like config_get_hash() did. + +* ext/openssl/xp_ssl.c: + MFB53: Fixed bug#44716 (Progress notifications incorrect) + +* (PHP_5_3) + ext/openssl/xp_ssl.c: + Fixed bug#44716 (Progress notifications incorrect) + +* (PHP_5_3) + NEWS + ext/standard/streamsfuncs.c: + MFH: Add params argument to stream_context_create() + +2008-04-14 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_3) + ext/standard/streamsfuncs.c: + fix ZTS build and sync with HEAD + 2008-04-13 Hannes Magnusson [EMAIL PROTECTED] * ext/standard/streamsfuncs.c
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard streamsfuncs.c
tony2001Mon Apr 14 07:49:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard streamsfuncs.c
Log:
fix ZTS build and sync with HEAD
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.11r2=1.58.2.6.2.15.2.12diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.11
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.12
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.11 Sun Apr 13
22:35:27 2008
+++ php-src/ext/standard/streamsfuncs.c Mon Apr 14 07:49:00 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.11 2008/04/13 22:35:27 bjori Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.12 2008/04/14 07:49:00 tony2001 Exp $
*/
#include php.h
#include php_globals.h
@@ -850,7 +850,7 @@
}
}
-static int parse_context_options(php_stream_context *context, zval *options)
+static int parse_context_options(php_stream_context *context, zval *options
TSRMLS_DC)
{
HashPosition pos, opos;
zval **wval, **oval;
@@ -874,7 +874,7 @@
}
} else {
- zend_error(E_WARNING, options should have the form
[\wrappername\][\optionname\] = $value);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, options
should have the form [\wrappername\][\optionname\] = $value);
}
zend_hash_move_forward_ex(Z_ARRVAL_P(options), pos);
}
@@ -882,7 +882,7 @@
return ret;
}
-static int parse_context_params(php_stream_context *context, zval *params)
+static int parse_context_params(php_stream_context *context, zval *params
TSRMLS_DC)
{
int ret = SUCCESS;
zval **tmp;
@@ -902,7 +902,7 @@
}
if (SUCCESS == zend_hash_find(Z_ARRVAL_P(params), options,
sizeof(options), (void**)tmp)) {
if (Z_TYPE_PP(tmp) == IS_ARRAY) {
- parse_context_options(context, *tmp);
+ parse_context_options(context, *tmp TSRMLS_CC);
} else {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Invalid
stream/context parameter);
}
@@ -988,7 +988,7 @@
if (options) {
/* handle the array syntax */
- RETVAL_BOOL(parse_context_options(context, options) == SUCCESS);
+ RETVAL_BOOL(parse_context_options(context, options TSRMLS_CC)
== SUCCESS);
} else {
php_stream_context_set_option(context, wrappername, optionname,
zvalue);
RETVAL_TRUE;
@@ -1013,7 +1013,7 @@
RETURN_FALSE;
}
- RETVAL_BOOL(parse_context_params(context, params) == SUCCESS);
+ RETVAL_BOOL(parse_context_params(context, params TSRMLS_CC) == SUCCESS);
}
/* }}} */
@@ -1034,7 +1034,7 @@
context = FG(default_context);
if (params) {
- parse_context_options(context, params);
+ parse_context_options(context, params TSRMLS_CC);
}
php_stream_context_to_zval(context, return_value);
@@ -1055,7 +1055,7 @@
context = php_stream_context_alloc();
if (params) {
- parse_context_options(context, params);
+ parse_context_options(context, params TSRMLS_CC);
}
php_stream_context_to_zval(context, return_value);
--
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/standard streamsfuncs.c
bjori Mon Apr 14 08:15:12 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard streamsfuncs.c
/php-srcNEWS
Log:
MFH: Add params argument to stream_context_create()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.15.2.12r2=1.58.2.6.2.15.2.13diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.12
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.13
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.15.2.12 Mon Apr 14
07:49:00 2008
+++ php-src/ext/standard/streamsfuncs.c Mon Apr 14 08:15:11 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.12 2008/04/14 07:49:00 tony2001 Exp $
*/
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.15.2.13 2008/04/14 08:15:11 bjori Exp $ */
#include php.h
#include php_globals.h
@@ -1041,21 +1041,25 @@
}
/* }}} */
-/* {{{ proto resource stream_context_create([array options])
+/* {{{ proto resource stream_context_create([array options[, array params]])
Create a file context and optionally set parameters */
PHP_FUNCTION(stream_context_create)
{
- zval *params = NULL;
+ zval *options = NULL, *params = NULL;
php_stream_context *context;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |a, params) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |a!a!, options,
params) == FAILURE) {
RETURN_FALSE;
}
context = php_stream_context_alloc();
+ if (options) {
+ parse_context_options(context, options TSRMLS_CC);
+ }
+
if (params) {
- parse_context_options(context, params TSRMLS_CC);
+ parse_context_params(context, params TSRMLS_CC);
}
php_stream_context_to_zval(context, return_value);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.157r2=1.2027.2.547.2.965.2.158diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.157
php-src/NEWS:1.2027.2.547.2.965.2.158
--- php-src/NEWS:1.2027.2.547.2.965.2.157 Fri Apr 11 09:43:27 2008
+++ php-src/NEWSMon Apr 14 08:15:11 2008
@@ -130,6 +130,7 @@
. Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
. Added context parameter for copy() function. (Sara)
. Added glob stream wrapper. (Marcus)
+ . Added params as optional parameter for stream_context_create(). (Sara)
- Improved ext/soap to support element names in context of XMLShema's any.
(Dmitry)
- Improved ext/openssl: (Dmitry)
@@ -158,7 +159,7 @@
- Fixed bug #44214 (Crash using preg_replace_callback() and global variable).
(Nuno, Scott)
- Fixed bug #43960 (strtotime() returns timestamp in the future when given a
- bogus string).
+ bogus string). (Derick)
- Fixed bug #43832 (mysqli_get_charset() doesn't expose charset comment).
(Andrey)
- Fixed bug #43808 (date_create never fails (even when it should)). (Derick)
--
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/openssl xp_ssl.c
bjori Mon Apr 14 12:16:07 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/opensslxp_ssl.c
Log:
Fixed bug#44716 (Progress notifications incorrect)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.9.2.4r2=1.22.2.3.2.9.2.5diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.4
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.5
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.4 Fri Apr 4 13:02:47 2008
+++ php-src/ext/openssl/xp_ssl.cMon Apr 14 12:16:07 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.4 2008/04/04 13:02:47 jorton Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.5 2008/04/14 12:16:07 bjori Exp $ */
#include php.h
#include ext/standard/file.h
@@ -198,14 +198,13 @@
break;
}
} while(retry);
-
+
+ if (didwrite 0) {
+ php_stream_notify_progress_increment(stream-context,
didwrite, 0);
+ }
} else {
didwrite = php_stream_socket_ops.write(stream, buf, count
TSRMLS_CC);
}
-
- if (didwrite 0) {
- php_stream_notify_progress_increment(stream-context, didwrite,
0);
- }
if (didwrite 0) {
didwrite = 0;
@@ -234,16 +233,16 @@
break;
}
} while (retry);
+
+ if (nr_bytes 0) {
+ php_stream_notify_progress_increment(stream-context,
nr_bytes, 0);
+ }
}
else
{
nr_bytes = php_stream_socket_ops.read(stream, buf, count
TSRMLS_CC);
}
- if (nr_bytes 0) {
- php_stream_notify_progress_increment(stream-context, nr_bytes,
0);
- }
-
if (nr_bytes 0) {
nr_bytes = 0;
}
--
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/openssl xp_ssl.c
Wait for 5.2.7 I assume?
-Hannes
On Mon, Apr 14, 2008 at 2:16 PM, Hannes Magnusson [EMAIL PROTECTED] wrote:
bjori Mon Apr 14 12:16:07 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/opensslxp_ssl.c
Log:
Fixed bug#44716 (Progress notifications incorrect)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.9.2.4r2=1.22.2.3.2.9.2.5diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.4
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.5
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.4 Fri Apr 4 13:02:47
2008
+++ php-src/ext/openssl/xp_ssl.cMon Apr 14 12:16:07 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.4 2008/04/04 13:02:47 jorton Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.5 2008/04/14 12:16:07 bjori Exp $ */
#include php.h
#include ext/standard/file.h
@@ -198,14 +198,13 @@
break;
}
} while(retry);
-
+
+ if (didwrite 0) {
+
php_stream_notify_progress_increment(stream-context, didwrite, 0);
+ }
} else {
didwrite = php_stream_socket_ops.write(stream, buf, count
TSRMLS_CC);
}
-
- if (didwrite 0) {
- php_stream_notify_progress_increment(stream-context,
didwrite, 0);
- }
if (didwrite 0) {
didwrite = 0;
@@ -234,16 +233,16 @@
break;
}
} while (retry);
+
+ if (nr_bytes 0) {
+
php_stream_notify_progress_increment(stream-context, nr_bytes, 0);
+ }
}
else
{
nr_bytes = php_stream_socket_ops.read(stream, buf, count
TSRMLS_CC);
}
- if (nr_bytes 0) {
- php_stream_notify_progress_increment(stream-context,
nr_bytes, 0);
- }
-
if (nr_bytes 0) {
nr_bytes = 0;
}
--
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 /ext/openssl xp_ssl.c
bjori Mon Apr 14 12:17:38 2008 UTC
Modified files:
/php-src/ext/opensslxp_ssl.c
Log:
MFB53: Fixed bug#44716 (Progress notifications incorrect)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.36 php-src/ext/openssl/xp_ssl.c:1.37
--- php-src/ext/openssl/xp_ssl.c:1.36 Fri Apr 4 12:49:57 2008
+++ php-src/ext/openssl/xp_ssl.cMon Apr 14 12:17:38 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: xp_ssl.c,v 1.36 2008/04/04 12:49:57 jorton Exp $ */
+/* $Id: xp_ssl.c,v 1.37 2008/04/14 12:17:38 bjori Exp $ */
#include php.h
#include ext/standard/file.h
@@ -198,14 +198,13 @@
break;
}
} while(retry);
-
+
+ if (didwrite 0) {
+ php_stream_notify_progress_increment(stream-context,
didwrite, 0);
+ }
} else {
didwrite = php_stream_socket_ops.write(stream, buf, count
TSRMLS_CC);
}
-
- if (didwrite 0) {
- php_stream_notify_progress_increment(stream-context, didwrite,
0);
- }
if (didwrite 0) {
didwrite = 0;
@@ -234,16 +233,16 @@
break;
}
} while (retry);
+
+ if (nr_bytes 0) {
+ php_stream_notify_progress_increment(stream-context,
nr_bytes, 0);
+ }
}
else
{
nr_bytes = php_stream_socket_ops.read(stream, buf, count
TSRMLS_CC);
}
- if (nr_bytes 0) {
- php_stream_notify_progress_increment(stream-context, nr_bytes,
0);
- }
-
if (nr_bytes 0) {
nr_bytes = 0;
}
--
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 basic_functions.c basic_functions.h /ext/standard/tests/general_functions ini_get_all.phpt
bjori Mon Apr 14 15:32:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions ini_get_all.phpt
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
[DOC] Remove config_get_hash() and add new boolean parameter to
ini_get_all()
to list ini entries key=current_value like config_get_hash() did.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/ini_get_all.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/ini_get_all.phpt
diff -u
php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.2.2.1
php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.2.2.1
Mon Oct 1 12:40:54 2007
+++ php-src/ext/standard/tests/general_functions/ini_get_all.phpt Mon Apr
14 15:32:42 2008
@@ -1,5 +1,8 @@
--TEST--
ini_get_all() tests
+--INI--
+pcre.backtrack_limit=10
+pcre.recursion_limit=10
--SKIPIF--
?php if (!extension_loaded(reflection)) die(skip); ?
--FILE--
@@ -10,6 +13,8 @@
var_dump(ini_get_all(nosuchextension));
var_dump(ini_get_all(reflection));
var_dump(ini_get_all(pcre));
+var_dump(ini_get_all(pcre, false));
+var_dump(ini_get_all(reflection, false));
var_dump(ini_get_all(, ));
@@ -45,7 +50,15 @@
int(7)
}
}
+array(2) {
+ [pcre.backtrack_limit]=
+ string(6) 10
+ [pcre.recursion_limit]=
+ string(6) 10
+}
+array(0) {
+}
-Warning: ini_get_all() expects at most 1 parameter, 2 given in %s on line %d
-NULL
+Warning: ini_get_all(): Unable to find extension '' in %sini_get_all.php on
line %d
+bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.24r2=1.725.2.31.2.64.2.25diff_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.24
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.25
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.24 Mon Apr 7
10:44:59 2008
+++ php-src/ext/standard/basic_functions.c Mon Apr 14 15:32:42 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.24 2008/04/07 10:44:59 colder
Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.25 2008/04/14 15:32:42 bjori Exp
$ */
#include php.h
#include php_streams.h
@@ -959,10 +959,6 @@
ZEND_END_ARG_INFO()
static
-ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
-ZEND_END_ARG_INFO()
-
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
ZEND_ARG_INFO(0, types)
ZEND_ARG_INFO(0, prefix)
@@ -3417,7 +3413,6 @@
PHP_FE(connection_status,
arginfo_connection_status)
PHP_FE(ignore_user_abort,
arginfo_ignore_user_abort)
PHP_FE(parse_ini_file,
arginfo_parse_ini_file)
- PHP_FE(config_get_hash,
arginfo_config_get_hash)
PHP_FE(is_uploaded_file,
arginfo_is_uploaded_file)
PHP_FE(move_uploaded_file,
arginfo_move_uploaded_file)
@@ -5663,6 +5658,7 @@
{
zval *ini_array = va_arg(args, zval *);
int module_number = va_arg(args, int);
+ int details = va_arg(args, int);
zval *option;
if (module_number != 0 ini_entry-module_number != module_number) {
@@ -5672,40 +5668,49 @@
if (hash_key-nKeyLength == 0 ||
hash_key-arKey[0] != 0
) {
- MAKE_STD_ZVAL(option);
- array_init(option);
+ if (details) {
+ MAKE_STD_ZVAL(option);
+ array_init(option);
+
+ if (ini_entry-orig_value) {
+ add_assoc_stringl(option, global_value,
ini_entry-orig_value, ini_entry-orig_value_length, 1);
+ } else if (ini_entry-value) {
+ add_assoc_stringl(option, global_value,
ini_entry-value, ini_entry-value_length, 1);
+ } else {
+ add_assoc_null(option, global_value);
+ }
- if (ini_entry-orig_value) {
- add_assoc_stringl(option, global_value,
ini_entry-orig_value, ini_entry-orig_value_length, 1);
- } else if
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c basic_functions.h /ext/standard/tests/general_functions ini_get_all.phpt
Eh..do you really understand the code correctly..? ini_get_all() is very much
different what config_dump_hash() was/is.
--Jani
Hannes Magnusson kirjoitti:
bjori Mon Apr 14 15:32:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions ini_get_all.phpt
/php-src/ext/standard basic_functions.c basic_functions.h
Log:
[DOC] Remove config_get_hash() and add new boolean parameter to
ini_get_all()
to list ini entries key=current_value like config_get_hash() did.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/ini_get_all.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/ini_get_all.phpt
diff -u
php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.2.2.1
php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.2.2.2
--- php-src/ext/standard/tests/general_functions/ini_get_all.phpt:1.1.2.2.2.1
Mon Oct 1 12:40:54 2007
+++ php-src/ext/standard/tests/general_functions/ini_get_all.phpt Mon Apr
14 15:32:42 2008
@@ -1,5 +1,8 @@
--TEST--
ini_get_all() tests
+--INI--
+pcre.backtrack_limit=10
+pcre.recursion_limit=10
--SKIPIF--
?php if (!extension_loaded(reflection)) die(skip); ?
--FILE--
@@ -10,6 +13,8 @@
var_dump(ini_get_all(nosuchextension));
var_dump(ini_get_all(reflection));
var_dump(ini_get_all(pcre));
+var_dump(ini_get_all(pcre, false));
+var_dump(ini_get_all(reflection, false));
var_dump(ini_get_all(, ));
@@ -45,7 +50,15 @@
int(7)
}
}
+array(2) {
+ [pcre.backtrack_limit]=
+ string(6) 10
+ [pcre.recursion_limit]=
+ string(6) 10
+}
+array(0) {
+}
-Warning: ini_get_all() expects at most 1 parameter, 2 given in %s on line %d
-NULL
+Warning: ini_get_all(): Unable to find extension '' in %sini_get_all.php on
line %d
+bool(false)
Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.24r2=1.725.2.31.2.64.2.25diff_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.24
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.25
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.24 Mon Apr 7
10:44:59 2008
+++ php-src/ext/standard/basic_functions.c Mon Apr 14 15:32:42 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.24 2008/04/07 10:44:59 colder Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.25 2008/04/14 15:32:42 bjori Exp
$ */
#include php.h
#include php_streams.h
@@ -959,10 +959,6 @@
ZEND_END_ARG_INFO()
static
-ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
-ZEND_END_ARG_INFO()
-
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
ZEND_ARG_INFO(0, types)
ZEND_ARG_INFO(0, prefix)
@@ -3417,7 +3413,6 @@
PHP_FE(connection_status,
arginfo_connection_status)
PHP_FE(ignore_user_abort,
arginfo_ignore_user_abort)
PHP_FE(parse_ini_file,
arginfo_parse_ini_file)
- PHP_FE(config_get_hash,
arginfo_config_get_hash)
PHP_FE(is_uploaded_file,
arginfo_is_uploaded_file)
PHP_FE(move_uploaded_file,
arginfo_move_uploaded_file)
@@ -5663,6 +5658,7 @@
{
zval *ini_array = va_arg(args, zval *);
int module_number = va_arg(args, int);
+ int details = va_arg(args, int);
zval *option;
if (module_number != 0 ini_entry-module_number != module_number) {
@@ -5672,40 +5668,49 @@
if (hash_key-nKeyLength == 0 ||
hash_key-arKey[0] != 0
) {
- MAKE_STD_ZVAL(option);
- array_init(option);
+ if (details) {
+ MAKE_STD_ZVAL(option);
+ array_init(option);
+
+ if (ini_entry-orig_value) {
+ add_assoc_stringl(option, global_value,
ini_entry-orig_value, ini_entry-orig_value_length, 1);
+ } else if (ini_entry-value) {
+ add_assoc_stringl(option, global_value,
ini_entry-value, ini_entry-value_length, 1);
+ } else {
+ add_assoc_null(option, global_value);
+ }
- if (ini_entry-orig_value) {
-
[PHP-CVS] cvs: php-src /ext/standard basic_functions.c /ext/standard/tests/general_functions ini_get_all.phpt
bjori Mon Apr 14 15:42:14 2008 UTC
Modified files:
/php-src/ext/standard basic_functions.c
/php-src/ext/standard/tests/general_functions ini_get_all.phpt
Log:
MFB5.3: Remove config_get_hash() and add new boolean parameter to
ini_get_all() to list ini entries key=current_value like config_get_hash()
did.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.893r2=1.894diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.893
php-src/ext/standard/basic_functions.c:1.894
--- php-src/ext/standard/basic_functions.c:1.893Mon Apr 7 10:39:43 2008
+++ php-src/ext/standard/basic_functions.c Mon Apr 14 15:42:13 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: basic_functions.c,v 1.893 2008/04/07 10:39:43 colder Exp $ */
+/* $Id: basic_functions.c,v 1.894 2008/04/14 15:42:13 bjori Exp $ */
#include php.h
#include php_streams.h
@@ -957,10 +957,6 @@
ZEND_END_ARG_INFO()
static
-ZEND_BEGIN_ARG_INFO(arginfo_config_get_hash, 0)
-ZEND_END_ARG_INFO()
-
-static
ZEND_BEGIN_ARG_INFO_EX(arginfo_import_request_variables, 0, 0, 1)
ZEND_ARG_INFO(0, types)
ZEND_ARG_INFO(0, prefix)
@@ -3452,7 +3448,6 @@
PHP_FE(connection_status,
arginfo_connection_status)
PHP_FE(ignore_user_abort,
arginfo_ignore_user_abort)
PHP_FE(parse_ini_file,
arginfo_parse_ini_file)
- PHP_FE(config_get_hash,
arginfo_config_get_hash)
PHP_FE(is_uploaded_file,
arginfo_is_uploaded_file)
PHP_FE(move_uploaded_file,
arginfo_move_uploaded_file)
@@ -5652,6 +5647,7 @@
{
zval *ini_array = va_arg(args, zval *);
int module_number = va_arg(args, int);
+ int details = va_arg(args, int);
zval *option;
TSRMLS_FETCH();
@@ -5663,40 +5659,49 @@
hash_key-type != IS_STRING ||
hash_key-arKey.s[0] != 0
) {
- MAKE_STD_ZVAL(option);
- array_init(option);
+ if (details) {
+ MAKE_STD_ZVAL(option);
+ array_init(option);
+
+ if (ini_entry-orig_value) {
+ add_ascii_assoc_utf8_stringl(option,
global_value, ini_entry-orig_value, ini_entry-orig_value_length, 1);
+ } else if (ini_entry-value) {
+ add_ascii_assoc_utf8_stringl(option,
global_value, ini_entry-value, ini_entry-value_length, 1);
+ } else {
+ add_ascii_assoc_null(option, global_value);
+ }
- if (ini_entry-orig_value) {
- add_ascii_assoc_utf8_stringl(option, global_value,
ini_entry-orig_value, ini_entry-orig_value_length, 1);
- } else if (ini_entry-value) {
- add_ascii_assoc_utf8_stringl(option, global_value,
ini_entry-value, ini_entry-value_length, 1);
- } else {
- add_ascii_assoc_null(option, global_value);
- }
+ if (ini_entry-value) {
+ add_ascii_assoc_utf8_stringl(option,
local_value, ini_entry-value, ini_entry-value_length, 1);
+ } else {
+ add_ascii_assoc_null(option, local_value);
+ }
+
+ add_ascii_assoc_long(option, access,
ini_entry-modifiable);
- if (ini_entry-value) {
- add_ascii_assoc_utf8_stringl(option, local_value,
ini_entry-value, ini_entry-value_length, 1);
+ add_ascii_assoc_zval_ex(ini_array, ini_entry-name,
ini_entry-name_length, option);
} else {
- add_ascii_assoc_null(option, local_value);
+ if (ini_entry-value) {
+ add_ascii_assoc_utf8_stringl(ini_array,
ini_entry-name, ini_entry-value, ini_entry-value_length, 1);
+ } else {
+ add_ascii_assoc_null(ini_array,
ini_entry-name);
+ }
}
-
- add_ascii_assoc_long(option, access, ini_entry-modifiable);
-
- add_ascii_assoc_zval_ex(ini_array,
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard basic_functions.c basic_functions.h /ext/standard/tests/general_functions ini_get_all.phpt
On Mon, Apr 14, 2008 at 5:40 PM, Jani Taskinen [EMAIL PROTECTED] wrote: Eh..do you really understand the code correctly..? ini_get_all() is very much different what config_dump_hash() was/is. Uhh.. I don't see the difference. And there are no tests to compare it against. I already asked on internals@ and after no reply I tracked down helly on IRC and he was fine with merging them. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /pear Makefile.frag fetch.php
bjori Mon Apr 14 16:56:51 2008 UTC Added files: (Branch: PHP_5_3) /php-src/pear fetch.php Modified files: /php-src/pear Makefile.frag Log: Use PHP to fetch the pear phar http://cvs.php.net/viewvc.cgi/php-src/pear/Makefile.frag?r1=1.35.6.10.2.2r2=1.35.6.10.2.2.2.1diff_format=u Index: php-src/pear/Makefile.frag diff -u php-src/pear/Makefile.frag:1.35.6.10.2.2 php-src/pear/Makefile.frag:1.35.6.10.2.2.2.1 --- php-src/pear/Makefile.frag:1.35.6.10.2.2Wed Nov 8 19:05:41 2006 +++ php-src/pear/Makefile.frag Mon Apr 14 16:56:50 2008 @@ -4,8 +4,6 @@ # Skip all php.ini files altogether PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 -WGET = `which wget 2/dev/null` -FETCH = `which fetch 2/dev/null` install-pear-installer: $(SAPI_CLI_PATH) @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d $(peardir) -b $(bindir) @@ -16,15 +14,7 @@ if test -f $(srcdir)/install-pear-nozlib.phar; then \ cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ else \ - if test ! -z $(WGET) test -x $(WGET); then \ - $(WGET) http://pear.php.net/install-pear-nozlib.phar -nd -P $(builddir)/; \ - elif test ! -z $(FETCH) test -x $(FETCH); then \ - $(FETCH) -o $(builddir)/ http://pear.php.net/install-pear-nozlib.phar; \ - else \ - echo ; \ - echo No download utilities found. Don't know how to download PEAR archive.; \ - echo ; \ - fi \ + $(top_builddir)/sapi/cli/php -n $(srcdir)/fetch.php http://pear.php.net/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ fi \ fi @if test -f $(builddir)/install-pear-nozlib.phar $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ http://cvs.php.net/viewvc.cgi/php-src/pear/fetch.php?view=markuprev=1.1 Index: php-src/pear/fetch.php +++ php-src/pear/fetch.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dns.c
colder Mon Apr 14 16:49:30 2008 UTC
Modified files:
/php-src/ext/standard dns.c
Log:
Fix dns_check_proto (related to #44723)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.91r2=1.92diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.91 php-src/ext/standard/dns.c:1.92
--- php-src/ext/standard/dns.c:1.91 Thu Jan 17 14:12:36 2008
+++ php-src/ext/standard/dns.c Mon Apr 14 16:49:30 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.91 2008/01/17 14:12:36 iliaa Exp $ */
+/* $Id: dns.c,v 1.92 2008/04/14 16:49:30 colder Exp $ */
/* {{{ includes */
#include php.h
@@ -247,7 +247,7 @@
#if HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE))
-/* {{{ proto int dns_check_record(string host [, string type]) U
+/* {{{ proto bool dns_check_record(string host [, string type]) U
Check DNS records corresponding to a given Internet host name or IP address
*/
PHP_FUNCTION(dns_check_record)
{
--
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 dns.c
colder Mon Apr 14 16:50:11 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard dns.c
Log:
MFH: Fix dns_check_proto (related to #44723)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dns.c?r1=1.70.2.7.2.5.2.4r2=1.70.2.7.2.5.2.5diff_format=u
Index: php-src/ext/standard/dns.c
diff -u php-src/ext/standard/dns.c:1.70.2.7.2.5.2.4
php-src/ext/standard/dns.c:1.70.2.7.2.5.2.5
--- php-src/ext/standard/dns.c:1.70.2.7.2.5.2.4 Thu Jan 17 14:12:12 2008
+++ php-src/ext/standard/dns.c Mon Apr 14 16:50:11 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: dns.c,v 1.70.2.7.2.5.2.4 2008/01/17 14:12:12 iliaa Exp $ */
+/* $Id: dns.c,v 1.70.2.7.2.5.2.5 2008/04/14 16:50:11 colder Exp $ */
/* {{{ includes */
#include php.h
@@ -247,7 +247,7 @@
#if HAVE_RES_SEARCH !(defined(__BEOS__)||defined(PHP_WIN32) ||
defined(NETWARE))
-/* {{{ proto int dns_check_record(string host [, string type])
+/* {{{ proto bool dns_check_record(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address
*/
PHP_FUNCTION(dns_check_record)
{
--
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/libxml/tests 004.phpt
felipe Mon Apr 14 17:24:11 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/libxml/tests 004.phpt Log: - Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/libxml/tests/004.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/libxml/tests/004.phpt diff -u php-src/ext/libxml/tests/004.phpt:1.1.2.1 php-src/ext/libxml/tests/004.phpt:1.1.2.1.2.1 --- php-src/ext/libxml/tests/004.phpt:1.1.2.1 Tue Jun 27 22:43:26 2006 +++ php-src/ext/libxml/tests/004.phpt Mon Apr 14 17:24:11 2008 @@ -27,7 +27,7 @@ ? --EXPECTF-- -Warning: options should have the form [wrappername][optionname] = $value in %s004.php on line 10 +Warning: stream_context_create(): options should have the form [wrappername][optionname] = $value in %s004.php on line 10 NULL Warning: DOMDocument::load(): supplied argument is not a valid Stream-Context resource in %s004.php on line 18 -- 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/strings 007.phpt
felipe Mon Apr 14 17:42:30 2008 UTC Modified files: /php-src/ext/standard/tests/strings 007.phpt Log: - Fixed test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/007.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/007.phpt diff -u php-src/ext/standard/tests/strings/007.phpt:1.2 php-src/ext/standard/tests/strings/007.phpt:1.3 --- php-src/ext/standard/tests/strings/007.phpt:1.2 Wed Mar 26 14:46:17 2008 +++ php-src/ext/standard/tests/strings/007.phpt Mon Apr 14 17:42:30 2008 @@ -13,7 +13,7 @@ echo Done\n; ? --EXPECTF-- -Warning: php_strip_whitespace(AA! A in %s on line %d +Warning: php_strip_whitespace(AA! AA): failed to open stream: File name too long in %s007.php on line %d string(0) bool(false) Done -- 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 basic_functions.c basic_functions.h /ext/standard/tests/general_functions ini_get_all.phpt
Hannes Magnusson kirjoitti: On Mon, Apr 14, 2008 at 5:40 PM, Jani Taskinen [EMAIL PROTECTED] wrote: Eh..do you really understand the code correctly..? ini_get_all() is very much different what config_dump_hash() was/is. Uhh.. I don't see the difference. And there are no tests to compare it against. I already asked on internals@ and after no reply I tracked down helly on IRC and he was fine with merging them. This function was originally just meant for debugging the config hash. And hint for the difference is: registered vs. anything (that was freebie..) Rule 1: Learn how to use CVS before you commit (hint: cvs annotate filename.ext) Rule 2: Once you learned how to use CVS and figured out who to ask: ASK. Rule 3: Ask the right people before committing. Rule 4: IRC != internals@ (I haven't seen ANY question about this on internals!) Now be good boy and revert the crap, that function is VERY useful for debugging how the php.ini stuff works (or not) and should be there. It was originally only enabled for debug builds and should always still be, I've no idea why Marcus made it enabled always in the first place.. --Jani -- 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/general_functions floatval.phpt
felipe Mon Apr 14 17:51:08 2008 UTC Modified files: /php-src/ext/standard/tests/general_functions floatval.phpt Log: - Fixed test (bug #44533) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/floatval.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/general_functions/floatval.phpt diff -u php-src/ext/standard/tests/general_functions/floatval.phpt:1.2 php-src/ext/standard/tests/general_functions/floatval.phpt:1.3 --- php-src/ext/standard/tests/general_functions/floatval.phpt:1.2 Tue Jun 5 09:21:54 2007 +++ php-src/ext/standard/tests/general_functions/floatval.phpt Mon Apr 14 17:51:08 2008 @@ -157,29 +157,17 @@ *** Testing floatval() on non floating types *** float(-2147483648) float(2147483648) - -Warning: floatval() expects parameter 1 to be double, resource given in %s on line %d -NULL - -Warning: floatval() expects parameter 1 to be double, resource given in %s on line %d -NULL +float(5) +float(6) float(0) float(1) float(-1300) - -Warning: floatval() expects parameter 1 to be double, string given in %s on line %d -NULL - -Notice: A non well formed numeric value encountered in %s on line %d +float(0) float(10) - -Notice: A non well formed numeric value encountered in %s on line %d float(10.2) float(11) float(11) - -Warning: floatval() expects parameter 1 to be double, string given in %s on line %d -NULL +float(0) float(1) float(0) float(0) @@ -187,45 +175,33 @@ *** Testing doubleval() on non floating types *** float(-2147483648) float(2147483648) - -Warning: doubleval() expects parameter 1 to be double, resource given in %s on line %d -NULL - -Warning: doubleval() expects parameter 1 to be double, resource given in %s on line %d -NULL +float(5) +float(6) float(0) float(1) float(-1300) - -Warning: doubleval() expects parameter 1 to be double, string given in %s on line %d -NULL - -Notice: A non well formed numeric value encountered in %s on line %d +float(0) float(10) - -Notice: A non well formed numeric value encountered in %s on line %d float(10.2) float(11) float(11) - -Warning: doubleval() expects parameter 1 to be double, string given in %s on line %d -NULL +float(0) float(1) float(0) float(0) *** Testing error conditions *** -Warning: floatval() expects exactly 1 parameter, 0 given in %s on line %d +Warning: Wrong parameter count for floatval() in %s on line %d NULL -Warning: doubleval() expects exactly 1 parameter, 0 given in %s on line %d +Warning: Wrong parameter count for doubleval() in %s on line %d NULL -Warning: floatval() expects exactly 1 parameter, 2 given in %s on line %d +Warning: Wrong parameter count for floatval() in %s on line %d NULL -Warning: doubleval() expects exactly 1 parameter, 2 given in %s on line %d +Warning: Wrong parameter count for doubleval() in %s on line %d NULL Done @@ -279,29 +255,17 @@ *** Testing floatval() on non floating types *** float(-2147483648) float(2147483648) - -Warning: floatval() expects parameter 1 to be double, resource given in %s on line %d -NULL - -Warning: floatval() expects parameter 1 to be double, resource given in %s on line %d -NULL +float(5) +float(6) float(0) float(1) float(-1300) - -Warning: floatval() expects parameter 1 to be double, Unicode string given in %s on line %d -NULL - -Notice: A non well formed numeric value encountered in %s on line %d +float(0) float(10) - -Notice: A non well formed numeric value encountered in %s on line %d float(10.2) float(11) float(11) - -Warning: floatval() expects parameter 1 to be double, Unicode string given in %s on line %d -NULL +float(0) float(1) float(0) float(0) @@ -309,45 +273,33 @@ *** Testing doubleval() on non floating types *** float(-2147483648) float(2147483648) - -Warning: doubleval() expects parameter 1 to be double, resource given in %s on line %d -NULL - -Warning: doubleval() expects parameter 1 to be double, resource given in %s on line %d -NULL +float(5) +float(6) float(0) float(1) float(-1300) - -Warning: doubleval() expects parameter 1 to be double, Unicode string given in %s on line %d -NULL - -Notice: A non well formed numeric value encountered in %s on line %d +float(0) float(10) - -Notice: A non well formed numeric value encountered in %s on line %d float(10.2) float(11) float(11) - -Warning: doubleval() expects parameter 1 to be double, Unicode string given in %s on line %d -NULL +float(0) float(1) float(0) float(0) *** Testing error conditions *** -Warning: floatval() expects exactly 1 parameter, 0 given in %s on line %d +Warning: Wrong parameter count for floatval() in %s on line %d NULL -Warning: doubleval() expects exactly 1 parameter, 0 given in %s on line %d +Warning: Wrong parameter count for doubleval() in %s on line %d NULL -Warning: floatval() expects exactly 1 parameter, 2 given in %s on line %d +Warning: Wrong parameter count for floatval() in %s on line %d NULL
[PHP-CVS] cvs: php-src(PHP_5_3) /win32/build confutils.js
sfoxMon Apr 14 17:55:02 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/buildconfutils.js
Log:
- Workarounds are no longer needed - thanks PECLers!
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.8.2.9r2=1.60.2.1.2.8.2.10diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.60.2.1.2.8.2.9
php-src/win32/build/confutils.js:1.60.2.1.2.8.2.10
--- php-src/win32/build/confutils.js:1.60.2.1.2.8.2.9 Mon Mar 31 09:17:25 2008
+++ php-src/win32/build/confutils.jsMon Apr 14 17:55:02 2008
@@ -17,7 +17,7 @@
+--+
*/
-// $Id: confutils.js,v 1.60.2.1.2.8.2.9 2008/03/31 09:17:25 sfox Exp $
+// $Id: confutils.js,v 1.60.2.1.2.8.2.10 2008/04/14 17:55:02 sfox Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -846,7 +846,6 @@
var debug = ;
var project_url = http://www.php.net;;
var project_header = creditspath + /php_ + basename + .h;
- var headerfile = ;
var versioning = ;
if (sapi) {
@@ -872,22 +871,10 @@
}
if (creditspath.match(new RegExp(pecl))) {
- /* PECL project url */
+ /* PECL project url - this will eventually work correctly for
all */
project_url = http://pecl.php.net/; + basename;
/* keep independent versioning PECL-specific for now */
- if (!FSO.FileExists(project_header)) { /* pick up a dozen
renegades */
- if (basename == doublemetaphone) headerfile =
/double_metaphone.h;
- if (basename == flitetts) headerfile = /php_flite.h;
- if (basename == gopher) headerfile =
/gopher_fopen_wrapper.h;
- if (basename == ingres) headerfile = /php_ii.h;
- if (basename == iisfunc || basename == ixsfunc)
headerfile = /setup.h;
- if (basename == satellite) headerfile =
/php_orbit.h;
- if (basename == stats) headerfile =
/php_statistics.h;
- if (!headerfile) headerfile = / + basename + .h;
- project_header = creditspath + headerfile;
- }
-
if (FSO.FileExists(project_header)) {
if (header = FSO.OpenTextFile(project_header, 1)) {
contents = header.ReadAll();
@@ -918,10 +905,11 @@
*/
if (FSO.FileExists(creditspath + '\\template.rc')) {
MFO.WriteLine($(BUILD_DIR)\\ + resname + : + creditspath +
\\template.rc);
- MFO.WriteLine(\t$(RC) /fo $(BUILD_DIR)\\ + resname + logo +
- ' /d FILE_DESCRIPTION=\\' + res_desc + '\\ /d
FILE_NAME=\\' + makefiletarget +
- '\\ /d PRODUCT_NAME=\\' + res_prod_name + '\\ /d
THANKS_GUYS=\\' +
- thanks + '\\ ' + creditspath + '\\template.rc');
+ MFO.WriteLine(\t$(RC) /fo $(BUILD_DIR)\\ + resname + logo +
debug +
+ ' /d FILE_DESCRIPTION=\\' + res_desc + '\\ /d
FILE_NAME=\\' +
+ makefiletarget + '\\ /d PRODUCT_NAME=\\' +
res_prod_name +
+ versioning + '\\ /d THANKS_GUYS=\\' + thanks +
'\\ ' +
+ creditspath + '\\template.rc');
return resname;
}
--
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 basic_functions.c basic_functions.h /ext/standard/tests/general_functions ini_get_all.phpt
On Mon, Apr 14, 2008 at 7:43 PM, Jani Taskinen [EMAIL PROTECTED] wrote: Hannes Magnusson kirjoitti: On Mon, Apr 14, 2008 at 5:40 PM, Jani Taskinen [EMAIL PROTECTED] wrote: Eh..do you really understand the code correctly..? ini_get_all() is very much different what config_dump_hash() was/is. Uhh.. I don't see the difference. And there are no tests to compare it against. I already asked on internals@ and after no reply I tracked down helly on IRC and he was fine with merging them. This function was originally just meant for debugging the config hash. And hint for the difference is: registered vs. anything (that was freebie..) Rule 1: Learn how to use CVS before you commit (hint: cvs annotate filename.ext) Rule 2: Once you learned how to use CVS and figured out who to ask: ASK. Rule 3: Ask the right people before committing. Rule 4: IRC != internals@ (I haven't seen ANY question about this on internals!) Now be good boy and revert the crap, that function is VERY useful for debugging how the php.ini stuff works (or not) and should be there. It was originally only enabled for debug builds and should always still be, I've no idea why Marcus made it enabled always in the first place.. Rule#1: Test the stuff you write, not only in your mind, with .phpt too Rule#2: Make sure there are not more than 3 functions doing almost the exact same thing. Rule#3: Subscribe to internals@ and participate in the discussion of your work Rule#4: Add comments about any hidden meanings behind the function Rule#5: Add a frckin [DOC] note to the commit explaining how the stuff works so it can be documented Rule#6: If you write a function just to so it can be used when debugging another internal feature add it in #ifdef FEATURE_DEBUG or whatever so other people don't come after you and wonder wtf you were thinking Rule#7: If a documentor asks for clarifications on internals@ then help him Rule#8: Do not reclassify bug-reports as documentation problem without further information If you don't tell anyone about what you are doing you cannot expect anyone else to know what your intentions are. If the function should be documented, removed, changed, only in debug mode, only there or only here. Marcus apparently thought you made a booboo and renamed it and enabled it in normal builds, and I seeing absolutely no point in yet another ini-get function combined it with another function seemingly serving the same purpose, in slightly different format... I did ask on internals@ if we really did need yet-another-ini-get function and since noone replied I followed your basic principle: Commit and let the trolls flame. -Hannes (learned from the best! ;)) -- 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 array_slice_variation6.phpt
iliaa Mon Apr 14 23:17:30 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/array array_slice_variation6.phpt
Log:
Fixed test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_slice_variation6.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/standard/tests/array/array_slice_variation6.phpt
diff -u php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.2
php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.3
--- php-src/ext/standard/tests/array/array_slice_variation6.phpt:1.1.4.2
Thu Feb 14 11:17:36 2008
+++ php-src/ext/standard/tests/array/array_slice_variation6.phptMon Apr
14 23:17:30 2008
@@ -133,15 +133,7 @@
}
-- $length is maximum integer value --
-array(4) {
- [0]=
- string(3) two
- [1]=
- string(5) three
- [2]=
- string(4) nine
- [ten]=
- int(10)
+array(0) {
}
-- $length is minimum integer value --
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session session.c
scottmacTue Apr 15 00:32:51 2008 UTC
Modified files:
/php-src/ext/sessionsession.c
Log:
Fixed bug #44722 (Segfault setting a null session path)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.482r2=1.483diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.482 php-src/ext/session/session.c:1.483
--- php-src/ext/session/session.c:1.482 Tue Mar 11 09:36:51 2008
+++ php-src/ext/session/session.c Tue Apr 15 00:32:51 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.482 2008/03/11 09:36:51 dmitry Exp $ */
+/* $Id: session.c,v 1.483 2008/04/15 00:32:51 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1516,7 +1516,7 @@
Return the current save path passed to module_name. If newname is given,
the save path is replaced with newname */
static PHP_FUNCTION(session_save_path)
{
- char *name;
+ char *name = NULL;
int name_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, name,
name_len, UG(utf8_conv)) == FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/session session.c
scottmacTue Apr 15 00:39:43 2008 UTC
Modified files:
/php-src/ext/sessionsession.c
Log:
Fixed bug #44719 (More uninitialised values causing wierd errors)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.483r2=1.484diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.483 php-src/ext/session/session.c:1.484
--- php-src/ext/session/session.c:1.483 Tue Apr 15 00:32:51 2008
+++ php-src/ext/session/session.c Tue Apr 15 00:39:43 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.483 2008/04/15 00:32:51 scottmac Exp $ */
+/* $Id: session.c,v 1.484 2008/04/15 00:39:43 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1626,7 +1626,7 @@
Return the current cache limiter. If new_cache_limited is given, the
current cache_limiter is replaced with new_cache_limiter */
static PHP_FUNCTION(session_cache_limiter)
{
- char *limiter;
+ char *limiter = NULL;
int limiter_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, limiter,
limiter_len, UG(utf8_conv)) == FAILURE) {
@@ -1646,7 +1646,7 @@
static PHP_FUNCTION(session_cache_expire)
{
/* Expires is really a numeric, but the alter_ini_entry method wants a
string */
- char *expires;
+ char *expires = NULL;
int expires_len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, |s, expires,
expires_len, UG(utf8_conv)) == FAILURE) {
--
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/session session.c
scottmacTue Apr 15 00:59:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sessionsession.c
Log:
Fixed bug #44720 (Prevent infinite recursion within session_register)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.6r2=1.417.2.8.2.40.2.7diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.6
php-src/ext/session/session.c:1.417.2.8.2.40.2.7
--- php-src/ext/session/session.c:1.417.2.8.2.40.2.6Tue Mar 11 09:36:41 2008
+++ php-src/ext/session/session.c Tue Apr 15 00:59:04 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.417.2.8.2.40.2.6 2008/03/11 09:36:41 dmitry Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.40.2.7 2008/04/15 00:59:04 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1655,12 +1655,19 @@
zval **value;
if (Z_TYPE_PP(entry) == IS_ARRAY) {
+ if (Z_ARRVAL_PP(entry)-nApplyCount 1) {
+ return;
+ }
+
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(entry));
+ Z_ARRVAL_PP(entry)-nApplyCount++;
while (zend_hash_get_current_data(Z_ARRVAL_PP(entry),
(void**)value) == SUCCESS) {
php_register_var(value TSRMLS_CC);
zend_hash_move_forward(Z_ARRVAL_PP(entry));
}
+
+ Z_ARRVAL_PP(entry)-nApplyCount--;
} else {
convert_to_string_ex(entry);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] Re: cvs: php-src(PHP_5_3) /ext/session session.c
Can i backport this to 5.2?
Scott MacVicar wrote:
scottmacTue Apr 15 00:59:04 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/session session.c
Log:
Fixed bug #44720 (Prevent infinite recursion within session_register)
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.417.2.8.2.40.2.6r2=1.417.2.8.2.40.2.7diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.8.2.40.2.6
php-src/ext/session/session.c:1.417.2.8.2.40.2.7
--- php-src/ext/session/session.c:1.417.2.8.2.40.2.6Tue Mar 11 09:36:41 2008
+++ php-src/ext/session/session.c Tue Apr 15 00:59:04 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: session.c,v 1.417.2.8.2.40.2.6 2008/03/11 09:36:41 dmitry Exp $ */
+/* $Id: session.c,v 1.417.2.8.2.40.2.7 2008/04/15 00:59:04 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1655,12 +1655,19 @@
zval **value;
if (Z_TYPE_PP(entry) == IS_ARRAY) {
+ if (Z_ARRVAL_PP(entry)-nApplyCount 1) {
+ return;
+ }
+
zend_hash_internal_pointer_reset(Z_ARRVAL_PP(entry));
+ Z_ARRVAL_PP(entry)-nApplyCount++;
while (zend_hash_get_current_data(Z_ARRVAL_PP(entry), (void**)value) == SUCCESS) {
php_register_var(value TSRMLS_CC);
zend_hash_move_forward(Z_ARRVAL_PP(entry));
}
+
+ Z_ARRVAL_PP(entry)-nApplyCount--;
} else {
convert_to_string_ex(entry);
Scott
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard html.c /ext/standard/tests/strings bug44703.phpt
Ooops,
Ilia, should this be reverted?
Sorry.
2008/4/11, Felipe Pena [EMAIL PROTECTED]:
felipe Fri Apr 11 19:01:25 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings bug44703.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard html.c
Log:
Fixed bug #44703 (htmlspecialchars() does not detect bad character set
argument) (patch by Andy Wharmby)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1141r2=1.2027.2.547.2.1142diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1141 php-src/NEWS:1.2027.2.547.2.1142
--- php-src/NEWS:1.2027.2.547.2.1141Thu Apr 10 22:31:09 2008
+++ php-src/NEWSFri Apr 11 19:01:24 2008
@@ -1,6 +1,8 @@
PHP
NEWS
|||
?? Apr 2008, PHP 5.2.6
+- Fixed bug #44703 (htmlspecialchars() does not detect bad character set
argument)
+ (Andy Wharmby)
10 Apr 2008, PHP 5.2.6RC5
- Fixed incorrect heredoc handling when label is used within the block.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.19r2=1.111.2.2.2.20diff_format=u
Index: php-src/ext/standard/html.c
diff -u php-src/ext/standard/html.c:1.111.2.2.2.19
php-src/ext/standard/html.c:1.111.2.2.2.20
--- php-src/ext/standard/html.c:1.111.2.2.2.19 Tue Jan 29 13:39:03 2008
+++ php-src/ext/standard/html.c Fri Apr 11 19:01:25 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: html.c,v 1.111.2.2.2.19 2008/01/29 13:39:03 tony2001 Exp $ */
+/* $Id: html.c,v 1.111.2.2.2.20 2008/04/11 19:01:25 felipe Exp $ */
/*
* HTML entity resources:
@@ -847,7 +847,7 @@
/* now walk the charset map and look for the codeset */
for (i = 0; charset_map[i].codeset; i++) {
- if (strncasecmp(charset_hint,
charset_map[i].codeset, len) == 0) {
+ if (len == strlen(charset_map[i].codeset)
strncasecmp(charset_hint, charset_map[i].codeset, len) == 0) {
charset = charset_map[i].charset;
found = 1;
break;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug44703.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/bug44703.phpt
+++ php-src/ext/standard/tests/strings/bug44703.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
--
Regards,
Felipe Pena.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
