[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun Jul 23 01:30:45 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2399r2=1.2400diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2399 php-src/ChangeLog:1.2400 --- php-src/ChangeLog:1.2399Sat Jul 22 01:30:50 2006 +++ php-src/ChangeLog Sun Jul 23 01:30:44 2006 @@ -1,3 +1,121 @@ +2006-07-22 Andrei Zmievski [EMAIL PROTECTED] + +* ext/xmlreader/php_xmlreader.c: + Mark XMLReader methods with U. + +* (PHP_5_2) + ext/standard/array.c: + Gah. + +* (PHP_5_2) + ext/standard/array.c: + Matt should be happy now. + +2006-07-22 Stefan Esser [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + main/rfc1867.c + main/rfc1867.h: + Added RFC1867 fileupload processing hook. + +2006-07-22 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + NEWS + Zend/zend_API.c + ZendEngine2/zend_API.c: + MFH:- Fixed bug #38183 (disable_classes=Foobar causes disabled class to be + called Foo) + +* ZendEngine2/zend_API.c: + - Fixed bug #38183 (disable_classes=Foobar causes disabled class to be + called Foo) + +2006-07-22 Rob Richards [EMAIL PROTECTED] + +* ext/json/config.w32: + enable by default + +2006-07-22 Nuno Lopes [EMAIL PROTECTED] + +* (PHP_5_2) + ext/json/JSON_parser.c + ext/json/json.c: + more const keywording + +* (PHP_5_2) + ext/gd/tests/dashedlines.phpt + ext/gd/tests/lines.phpt: + dont create images in the php source root. output them instead + +2006-07-22 Rob Richards [EMAIL PROTECTED] + +* win32/build/Makefile: + enable native and unicode tests + add ntest and utest build targets + +* run-tests.php: + force unicode off in native mode (-N switch) + swap usage of single and double quotes for win32 compat + +2006-07-22 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/filter/sanitizing_filters.c: + - MFB: fix compiler warnings + +* (PHP_5_2) + ext/filter/sanitizing_filters.c: + - hopla, before I got more conflicts ;) +(fix compiler warnings with latest const char changes) + +2006-07-22 Nuno Lopes [EMAIL PROTECTED] + +* ext/filter/filter.c + ext/filter/logical_filters.c + ext/filter/sanitizing_filters.c + ext/gd/tests/dashedlines.phpt + ext/gd/tests/lines.phpt + ext/json/JSON_parser.c + ext/json/json.c: + MFB + +* (PHP_5_2) + ext/filter/filter.c + ext/filter/logical_filters.c + ext/filter/sanitizing_filters.c: + use const keyword where possible + +2006-07-22 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/filter/filter.c + ext/filter/sanitizing_filters.c + ext/filter/tests/032.phpt + ext/filter/tests/bug7586.phpt + ext/filter/tests/bug7733.phpt: + MFB: + - API Shake up #1, change input_get_args argument order + - silent compiler warnings + - update tests + +* (PHP_5_2) + ext/filter/filter.c + ext/filter/sanitizing_filters.c: + - silent compiler warnings (char/unsigned char) + +* (PHP_5_2) + ext/filter/filter.c: + - api shake #1, parse_pararameter has to be changed too + +* (PHP_5_2) + ext/filter/filter.c + ext/filter/tests/032.phpt + ext/filter/tests/bug7586.phpt + ext/filter/tests/bug7733.phpt: + - API Shake up #1, use input type as first argument in input_get_args +(INPUT_GET/POST) + 2006-07-21 Andrei Zmievski [EMAIL PROTECTED] * ext/standard/array.c:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Sun Jul 23 01:30:49 2006 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.951r2=1.952diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.951 ZendEngine2/ChangeLog:1.952 --- ZendEngine2/ChangeLog:1.951 Sat Jul 22 01:30:53 2006 +++ ZendEngine2/ChangeLog Sun Jul 23 01:30:49 2006 @@ -1,3 +1,14 @@ +2006-07-22 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + zend_API.c: + MFH:- Fixed bug #38183 (disable_classes=Foobar causes disabled class to be + called Foo) + +* zend_API.c: + - Fixed bug #38183 (disable_classes=Foobar causes disabled class to be + called Foo) + 2006-07-21 Andrei Zmievski [EMAIL PROTECTED] * zend.h: @@ -14637,7 +14648,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.951 2006/07/22 01:30:53 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.952 2006/07/23 01:30:49 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -16361,7 +16372,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.951 2006/07/22 01:30:53 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.952 2006/07/23 01:30:49 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c /ext/filter/tests 032.phpt bug7586.phpt bug7733.phpt
pajoye Sat Jul 22 08:58:03 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
/php-src/ext/filter/tests 032.phpt bug7586.phpt bug7733.phpt
Log:
- API Shake up #1, use input type as first argument in input_get_args
(INPUT_GET/POST)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.2r2=1.52.2.3diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.2
php-src/ext/filter/filter.c:1.52.2.3
--- php-src/ext/filter/filter.c:1.52.2.2Wed Jul 19 07:18:34 2006
+++ php-src/ext/filter/filter.c Sat Jul 22 08:58:03 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.52.2.2 2006/07/19 07:18:34 tony2001 Exp $ */
+/* $Id: filter.c,v 1.52.2.3 2006/07/22 08:58:03 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering,
enabled );
- php_info_print_table_row( 2, Revision, $Revision: 1.52.2.2 $);
+ php_info_print_table_row( 2, Revision, $Revision: 1.52.2.3 $);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -621,8 +621,8 @@
}
/* }}} */
-/* {{{ proto mixed input_get_args(array definition, constant type [, array
data])
- * Returns an array with all arguments defined in 'definition'.
+/* {{{ proto mixed input_get_args(constant type, array definition, [, array
data])
+ * Returns an array with all arguments defined in 'definition'. INPUT_DATA
will use the data given as last argument.
*/
PHP_FUNCTION(input_get_args)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/032.phpt?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/ext/filter/tests/032.phpt
diff -u php-src/ext/filter/tests/032.phpt:1.1
php-src/ext/filter/tests/032.phpt:1.1.2.1
--- php-src/ext/filter/tests/032.phpt:1.1 Sun May 14 13:54:10 2006
+++ php-src/ext/filter/tests/032.phpt Sat Jul 22 08:58:03 2006
@@ -29,7 +29,7 @@
);
-$myinputs = input_get_args($args, INPUT_DATA, $data);
+$myinputs = input_get_args(INPUT_DATA, $args, $data);
var_dump($myinputs);
?
--EXPECT--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug7586.phpt?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/ext/filter/tests/bug7586.phpt
diff -u php-src/ext/filter/tests/bug7586.phpt:1.1
php-src/ext/filter/tests/bug7586.phpt:1.1.2.1
--- php-src/ext/filter/tests/bug7586.phpt:1.1 Tue May 9 11:14:43 2006
+++ php-src/ext/filter/tests/bug7586.phpt Sat Jul 22 08:58:03 2006
@@ -27,7 +27,7 @@
)
);
-$out = input_get_args($args, INPUT_DATA, $data);
+$out = input_get_args(INPUT_DATA, $args, $data);
var_dump($out);
?
--EXPECTF--
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug7733.phpt?r1=1.1r2=1.1.2.1diff_format=u
Index: php-src/ext/filter/tests/bug7733.phpt
diff -u php-src/ext/filter/tests/bug7733.phpt:1.1
php-src/ext/filter/tests/bug7733.phpt:1.1.2.1
--- php-src/ext/filter/tests/bug7733.phpt:1.1 Sun May 28 01:12:55 2006
+++ php-src/ext/filter/tests/bug7733.phpt Sat Jul 22 08:58:03 2006
@@ -1,5 +1,5 @@
--TEST--
-input_get_args() filter not reseted between elements
+filter_data() Float exponential weird result
--FILE--
?php
$data = array(
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c
pajoye Sat Jul 22 09:09:06 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
Log:
- api shake #1, parse_pararameter has to be changed too
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.3r2=1.52.2.4diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.3
php-src/ext/filter/filter.c:1.52.2.4
--- php-src/ext/filter/filter.c:1.52.2.3Sat Jul 22 08:58:03 2006
+++ php-src/ext/filter/filter.c Sat Jul 22 09:09:06 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.52.2.3 2006/07/22 08:58:03 pajoye Exp $ */
+/* $Id: filter.c,v 1.52.2.4 2006/07/22 09:09:06 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering,
enabled );
- php_info_print_table_row( 2, Revision, $Revision: 1.52.2.3 $);
+ php_info_print_table_row( 2, Revision, $Revision: 1.52.2.4 $);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -648,7 +648,7 @@
zval *array_ptr = NULL;
zval **element;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, al|a,
args_array, args_from, values) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, la|a,
args_array, args_from, values) == FAILURE) {
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c sanitizing_filters.c
pajoye Sat Jul 22 09:39:25 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter sanitizing_filters.c filter.c
Log:
- silent compiler warnings (char/unsigned char)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.11.2.1r2=1.11.2.2diff_format=u
Index: php-src/ext/filter/sanitizing_filters.c
diff -u php-src/ext/filter/sanitizing_filters.c:1.11.2.1
php-src/ext/filter/sanitizing_filters.c:1.11.2.2
--- php-src/ext/filter/sanitizing_filters.c:1.11.2.1Wed Jul 19 06:57:21 2006
+++ php-src/ext/filter/sanitizing_filters.c Sat Jul 22 09:39:24 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sanitizing_filters.c,v 1.11.2.1 2006/07/19 06:57:21 tony2001 Exp $ */
+/* $Id: sanitizing_filters.c,v 1.11.2.2 2006/07/22 09:39:24 pajoye Exp $ */
#include php_filter.h
#include filter_private.h
@@ -58,7 +58,7 @@
register int x, y;
smart_str str = {0};
int len = Z_STRLEN_P(value);
- unsigned char *s = Z_STRVAL_P(value);
+ unsigned char *s = (unsigned char *)Z_STRVAL_P(value);
if (Z_STRLEN_P(value) == 0) {
return;
@@ -106,7 +106,7 @@
}
str[y] = '\0';
efree(Z_STRVAL_P(value));
- Z_STRVAL_P(value) = str;
+ Z_STRVAL_P(value) = (char *)str;
Z_STRLEN_P(value) = y;
}
@@ -120,7 +120,7 @@
return;
}
- str = Z_STRVAL_P(value);
+ str = (unsigned char *)Z_STRVAL_P(value);
buf = safe_emalloc(1, Z_STRLEN_P(value) + 1, 1);
c = 0;
for (i = 0; i Z_STRLEN_P(value); i++) {
@@ -134,7 +134,7 @@
/* update zval string data */
buf[c] = '\0';
efree(Z_STRVAL_P(value));
- Z_STRVAL_P(value) = buf;
+ Z_STRVAL_P(value) = (char *)buf;
Z_STRLEN_P(value) = c;
}
/* }}} */
@@ -149,7 +149,7 @@
{
int l, i;
- l = strlen(allowed_list);
+ l = strlen((char*)allowed_list);
for (i = 0; i l; ++i) {
(*map)[allowed_list[i]] = flag;
}
@@ -160,7 +160,7 @@
unsigned char *buf, *str;
int i, c;
- str = Z_STRVAL_P(value);
+ str = (unsigned char *)Z_STRVAL_P(value);
buf = safe_emalloc(1, Z_STRLEN_P(value) + 1, 1);
c = 0;
for (i = 0; i Z_STRLEN_P(value); i++) {
@@ -172,7 +172,7 @@
/* update zval string data */
buf[c] = '\0';
efree(Z_STRVAL_P(value));
- Z_STRVAL_P(value) = buf;
+ Z_STRVAL_P(value) = (char *)buf;
Z_STRLEN_P(value) = c;
}
/* }}} */
@@ -255,7 +255,7 @@
void php_filter_email(PHP_INPUT_FILTER_PARAM_DECL)
{
/* Check section 6 of rfc 822 http://www.faqs.org/rfcs/rfc822.html */
- unsigned char *allowed_list = LOWALPHA HIALPHA DIGIT
!#$%'*+-/=?^_`{|[EMAIL PROTECTED];
+ unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-/=?^_`{|[EMAIL PROTECTED];
filter_map map;
filter_map_init(map);
@@ -269,7 +269,7 @@
{
/* Strip all chars not part of section 5 of
* http://www.faqs.org/rfcs/rfc1738.html */
- unsigned char *allowed_list = LOWALPHA HIALPHA DIGIT SAFE EXTRA
NATIONAL PUNCTUATION RESERVED;
+ unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT SAFE EXTRA
NATIONAL PUNCTUATION RESERVED;
filter_map map;
filter_map_init(map);
@@ -282,7 +282,7 @@
void php_filter_number_int(PHP_INPUT_FILTER_PARAM_DECL)
{
/* strip everything [^0-9+-] */
- unsigned char *allowed_list = +- DIGIT;
+ unsigned char allowed_list[] = +- DIGIT;
filter_map map;
filter_map_init(map);
@@ -295,7 +295,7 @@
void php_filter_number_float(PHP_INPUT_FILTER_PARAM_DECL)
{
/* strip everything [^0-9+-] */
- unsigned char *allowed_list = +- DIGIT;
+ unsigned char allowed_list[] = +- DIGIT;
filter_map map;
filter_map_init(map);
@@ -303,13 +303,13 @@
/* depending on flags, strip '.', 'e', ,, ' */
if (flags FILTER_FLAG_ALLOW_FRACTION) {
- filter_map_update(map, 2, .);
+ filter_map_update(map, 2, (unsigned char *) .);
}
if (flags FILTER_FLAG_ALLOW_THOUSAND) {
- filter_map_update(map, 3, ,);
+ filter_map_update(map, 3, (unsigned char *) ,);
}
if (flags FILTER_FLAG_ALLOW_SCIENTIFIC) {
- filter_map_update(map, 4, eE);
+ filter_map_update(map, 4, (unsigned char *) eE);
}
filter_map_apply(value, map);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.4r2=1.52.2.5diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.4
php-src/ext/filter/filter.c:1.52.2.5
--- php-src/ext/filter/filter.c:1.52.2.4Sat Jul 22 09:09:06 2006
+++ php-src/ext/filter/filter.c Sat Jul 22 09:39:24 2006
@@ -18,7 +18,7 @@
[PHP-CVS] cvs: php-src /ext/filter filter.c sanitizing_filters.c /ext/filter/tests 032.phpt bug7586.phpt bug7733.phpt
pajoye Sat Jul 22 09:51:50 2006 UTC
Modified files:
/php-src/ext/filter filter.c sanitizing_filters.c
/php-src/ext/filter/tests bug7733.phpt bug7586.phpt 032.phpt
Log:
MFB:
- API Shake up #1, change input_get_args argument order
- silent compiler warnings
- update tests
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.56r2=1.57diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.56 php-src/ext/filter/filter.c:1.57
--- php-src/ext/filter/filter.c:1.56Wed Jul 19 07:18:25 2006
+++ php-src/ext/filter/filter.c Sat Jul 22 09:51:50 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.56 2006/07/19 07:18:25 tony2001 Exp $ */
+/* $Id: filter.c,v 1.57 2006/07/22 09:51:50 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering,
enabled );
- php_info_print_table_row( 2, Revision, $Revision: 1.56 $);
+ php_info_print_table_row( 2, Revision, $Revision: 1.57 $);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -629,8 +629,8 @@
}
/* }}} */
-/* {{{ proto mixed input_get_args(array definition, constant type [, array
data])
- * Returns an array with all arguments defined in 'definition'.
+/* {{{ proto mixed input_get_args(constant type, array definition, [, array
data])
+ * Returns an array with all arguments defined in 'definition'. INPUT_DATA
will use the data given as last argument.
*/
PHP_FUNCTION(input_get_args)
{
@@ -656,7 +656,7 @@
zval *array_ptr = NULL;
zval **element;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, al|a,
args_array, args_from, values) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, la|a,
args_from, args_array, values) == FAILURE) {
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/filter/sanitizing_filters.c
diff -u php-src/ext/filter/sanitizing_filters.c:1.12
php-src/ext/filter/sanitizing_filters.c:1.13
--- php-src/ext/filter/sanitizing_filters.c:1.12Wed Jul 19 06:56:28 2006
+++ php-src/ext/filter/sanitizing_filters.c Sat Jul 22 09:51:50 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sanitizing_filters.c,v 1.12 2006/07/19 06:56:28 tony2001 Exp $ */
+/* $Id: sanitizing_filters.c,v 1.13 2006/07/22 09:51:50 pajoye Exp $ */
#include php_filter.h
#include filter_private.h
@@ -58,7 +58,7 @@
register int x, y;
smart_str str = {0};
int len = Z_STRLEN_P(value);
- unsigned char *s = Z_STRVAL_P(value);
+ unsigned char *s = (unsigned char *)Z_STRVAL_P(value);
if (Z_STRLEN_P(value) == 0) {
return;
@@ -106,7 +106,7 @@
}
str[y] = '\0';
efree(Z_STRVAL_P(value));
- Z_STRVAL_P(value) = str;
+ Z_STRVAL_P(value) = (char *)str;
Z_STRLEN_P(value) = y;
}
@@ -120,7 +120,7 @@
return;
}
- str = Z_STRVAL_P(value);
+ str = (unsigned char *)Z_STRVAL_P(value);
buf = safe_emalloc(1, Z_STRLEN_P(value) + 1, 1);
c = 0;
for (i = 0; i Z_STRLEN_P(value); i++) {
@@ -134,7 +134,7 @@
/* update zval string data */
buf[c] = '\0';
efree(Z_STRVAL_P(value));
- Z_STRVAL_P(value) = buf;
+ Z_STRVAL_P(value) = (char *)buf;
Z_STRLEN_P(value) = c;
}
/* }}} */
@@ -149,7 +149,7 @@
{
int l, i;
- l = strlen(allowed_list);
+ l = strlen((char*)allowed_list);
for (i = 0; i l; ++i) {
(*map)[allowed_list[i]] = flag;
}
@@ -160,7 +160,7 @@
unsigned char *buf, *str;
int i, c;
- str = Z_STRVAL_P(value);
+ str = (unsigned char *)Z_STRVAL_P(value);
buf = safe_emalloc(1, Z_STRLEN_P(value) + 1, 1);
c = 0;
for (i = 0; i Z_STRLEN_P(value); i++) {
@@ -172,7 +172,7 @@
/* update zval string data */
buf[c] = '\0';
efree(Z_STRVAL_P(value));
- Z_STRVAL_P(value) = buf;
+ Z_STRVAL_P(value) = (char *)buf;
Z_STRLEN_P(value) = c;
}
/* }}} */
@@ -255,7 +255,7 @@
void php_filter_email(PHP_INPUT_FILTER_PARAM_DECL)
{
/* Check section 6 of rfc 822 http://www.faqs.org/rfcs/rfc822.html */
- unsigned char *allowed_list = LOWALPHA HIALPHA DIGIT
!#$%'*+-/=?^_`{|[EMAIL PROTECTED];
+ unsigned char allowed_list[] = LOWALPHA HIALPHA DIGIT
!#$%'*+-/=?^_`{|[EMAIL PROTECTED];
filter_map map;
filter_map_init(map);
@@ -269,7 +269,7 @@
{
/* Strip all chars not part of section 5 of
* http://www.faqs.org/rfcs/rfc1738.html */
- unsigned char
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter filter.c logical_filters.c sanitizing_filters.c
nlopess Sat Jul 22 12:49:36 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c logical_filters.c sanitizing_filters.c
Log:
use const keyword where possible
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.5r2=1.52.2.6diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.5
php-src/ext/filter/filter.c:1.52.2.6
--- php-src/ext/filter/filter.c:1.52.2.5Sat Jul 22 09:39:24 2006
+++ php-src/ext/filter/filter.c Sat Jul 22 12:49:36 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.52.2.5 2006/07/22 09:39:24 pajoye Exp $ */
+/* $Id: filter.c,v 1.52.2.6 2006/07/22 12:49:36 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -31,7 +31,7 @@
#include filter_private.h
typedef struct filter_list_entry {
- char *name;
+ const char *name;
intid;
void (*function)(PHP_INPUT_FILTER_PARAM_DECL);
} filter_list_entry;
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering,
enabled );
- php_info_print_table_row( 2, Revision, $Revision: 1.52.2.5 $);
+ php_info_print_table_row( 2, Revision, $Revision: 1.52.2.6 $);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.2
php-src/ext/filter/logical_filters.c:1.1.2.3
--- php-src/ext/filter/logical_filters.c:1.1.2.2Thu Jul 20 12:58:12 2006
+++ php-src/ext/filter/logical_filters.cSat Jul 22 12:49:36 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.1.2.2 2006/07/20 12:58:12 pajoye Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.3 2006/07/22 12:49:36 nlopess Exp $ */
#include php_filter.h
#include filter_private.h
@@ -515,7 +515,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char *regexp =
/^((\\\[^\f\\n\\r\\t\\v\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/;
+ const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\v\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/;
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.11.2.2r2=1.11.2.3diff_format=u
Index: php-src/ext/filter/sanitizing_filters.c
diff -u php-src/ext/filter/sanitizing_filters.c:1.11.2.2
php-src/ext/filter/sanitizing_filters.c:1.11.2.3
--- php-src/ext/filter/sanitizing_filters.c:1.11.2.2Sat Jul 22 09:39:24 2006
+++ php-src/ext/filter/sanitizing_filters.c Sat Jul 22 12:49:36 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sanitizing_filters.c,v 1.11.2.2 2006/07/22 09:39:24 pajoye Exp $ */
+/* $Id: sanitizing_filters.c,v 1.11.2.3 2006/07/22 12:49:36 nlopess Exp $ */
#include php_filter.h
#include filter_private.h
@@ -27,7 +27,7 @@
/* }}} */
/* {{{ HELPER FUNCTIONS */
-static void php_filter_encode_html(zval *value, char* chars, int encode_nul)
+static void php_filter_encode_html(zval *value, const char* chars, int
encode_nul)
{
register int x, y;
smart_str str = {0};
@@ -79,7 +79,7 @@
Z_STRLEN_P(value) = str.len;
}
-static unsigned char hexchars[] = 0123456789ABCDEF;
+static const unsigned char hexchars[] = 0123456789ABCDEF;
#define LOWALPHAabcdefghijklmnopqrstuvwxyz
#define HIALPHA ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -87,7 +87,7 @@
#define DEFAULT_URL_ENCODELOWALPHA HIALPHA DIGIT -._
-static void php_filter_encode_url(zval
[PHP-CVS] cvs: php-src /ext/filter filter.c logical_filters.c sanitizing_filters.c
nlopess Sat Jul 22 12:54:05 2006 UTC
Modified files:
/php-src/ext/filter filter.c logical_filters.c sanitizing_filters.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.57r2=1.58diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.57 php-src/ext/filter/filter.c:1.58
--- php-src/ext/filter/filter.c:1.57Sat Jul 22 09:51:50 2006
+++ php-src/ext/filter/filter.c Sat Jul 22 12:54:05 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.57 2006/07/22 09:51:50 pajoye Exp $ */
+/* $Id: filter.c,v 1.58 2006/07/22 12:54:05 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -31,7 +31,7 @@
#include filter_private.h
typedef struct filter_list_entry {
- char *name;
+ const char *name;
intid;
void (*function)(PHP_INPUT_FILTER_PARAM_DECL);
} filter_list_entry;
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, Input Validation and Filtering,
enabled );
- php_info_print_table_row( 2, Revision, $Revision: 1.57 $);
+ php_info_print_table_row( 2, Revision, $Revision: 1.58 $);
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.3
php-src/ext/filter/logical_filters.c:1.4
--- php-src/ext/filter/logical_filters.c:1.3Thu Jul 20 13:03:02 2006
+++ php-src/ext/filter/logical_filters.cSat Jul 22 12:54:05 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.3 2006/07/20 13:03:02 pajoye Exp $ */
+/* $Id: logical_filters.c,v 1.4 2006/07/22 12:54:05 nlopess Exp $ */
#include php_filter.h
#include filter_private.h
@@ -515,7 +515,7 @@
void php_filter_validate_email(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
{
/* From
http://cvs.php.net/co.php/pear/HTML_QuickForm/QuickForm/Rule/Email.php?r=1.4 */
- const char *regexp =
/^((\\\[^\f\\n\\r\\t\\v\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/;
+ const char regexp[] =
/^((\\\[^\f\\n\\r\\t\\v\\b]+\\\)|([\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+(\\.[\\w\\!\\#\\$\\%'\\*\\+\\-\\~\\/\\^\\`\\|\\{\\}]+)*))@((\\[(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))\\])|(((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9]))\\.((25[0-5])|(2[0-4][0-9])|([0-1]?[0-9]?[0-9])))|((([A-Za-z0-9\\-])+\\.)+[A-Za-z\\-]+))$/;
pcre *re = NULL;
pcre_extra *pcre_extra = NULL;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/filter/sanitizing_filters.c
diff -u php-src/ext/filter/sanitizing_filters.c:1.13
php-src/ext/filter/sanitizing_filters.c:1.14
--- php-src/ext/filter/sanitizing_filters.c:1.13Sat Jul 22 09:51:50 2006
+++ php-src/ext/filter/sanitizing_filters.c Sat Jul 22 12:54:05 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sanitizing_filters.c,v 1.13 2006/07/22 09:51:50 pajoye Exp $ */
+/* $Id: sanitizing_filters.c,v 1.14 2006/07/22 12:54:05 nlopess Exp $ */
#include php_filter.h
#include filter_private.h
@@ -27,7 +27,7 @@
/* }}} */
/* {{{ HELPER FUNCTIONS */
-static void php_filter_encode_html(zval *value, char* chars, int encode_nul)
+static void php_filter_encode_html(zval *value, const char* chars, int
encode_nul)
{
register int x, y;
smart_str str = {0};
@@ -79,7 +79,7 @@
Z_STRLEN_P(value) = str.len;
}
-static unsigned char hexchars[] = 0123456789ABCDEF;
+static const unsigned char hexchars[] = 0123456789ABCDEF;
#define LOWALPHAabcdefghijklmnopqrstuvwxyz
#define HIALPHA ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ -87,7 +87,7 @@
#define DEFAULT_URL_ENCODELOWALPHA HIALPHA DIGIT -._
-static void php_filter_encode_url(zval *value, char* chars, int high, int low,
int encode_nul)
+static void php_filter_encode_url(zval *value, const char* chars, int high,
int low,
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/filter sanitizing_filters.c
pajoye Sat Jul 22 12:59:15 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter sanitizing_filters.c
Log:
- hopla, before I got more conflicts ;)
(fix compiler warnings with latest const char changes)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.11.2.3r2=1.11.2.4diff_format=u
Index: php-src/ext/filter/sanitizing_filters.c
diff -u php-src/ext/filter/sanitizing_filters.c:1.11.2.3
php-src/ext/filter/sanitizing_filters.c:1.11.2.4
--- php-src/ext/filter/sanitizing_filters.c:1.11.2.3Sat Jul 22 12:49:36 2006
+++ php-src/ext/filter/sanitizing_filters.c Sat Jul 22 12:59:15 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sanitizing_filters.c,v 1.11.2.3 2006/07/22 12:49:36 nlopess Exp $ */
+/* $Id: sanitizing_filters.c,v 1.11.2.4 2006/07/22 12:59:15 pajoye Exp $ */
#include php_filter.h
#include filter_private.h
@@ -303,13 +303,13 @@
/* depending on flags, strip '.', 'e', ,, ' */
if (flags FILTER_FLAG_ALLOW_FRACTION) {
- filter_map_update(map, 2, (unsigned char *) .);
+ filter_map_update(map, 2, (const unsigned char *) .);
}
if (flags FILTER_FLAG_ALLOW_THOUSAND) {
- filter_map_update(map, 3, (unsigned char *) ,);
+ filter_map_update(map, 3, (const unsigned char *) ,);
}
if (flags FILTER_FLAG_ALLOW_SCIENTIFIC) {
- filter_map_update(map, 4, (unsigned char *) eE);
+ filter_map_update(map, 4, (const unsigned char *) eE);
}
filter_map_apply(value, map);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
rrichards Sat Jul 22 13:12:20 2006 UTC
Modified files:
/php-srcrun-tests.php
Log:
force unicode off in native mode (-N switch)
swap usage of single and double quotes for win32 compat
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.297r2=1.298diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.297 php-src/run-tests.php:1.298
--- php-src/run-tests.php:1.297 Mon Jul 17 11:46:12 2006
+++ php-src/run-tests.php Sat Jul 22 13:12:19 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.297 2006/07/17 11:46:12 nlopess Exp $ */
+/* $Id: run-tests.php,v 1.298 2006/07/22 13:12:19 rrichards Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -179,9 +179,9 @@
settings2params($info_params);
$php_info = `$php $pass_options $info_params $info_file`;
@unlink($info_file);
- define('TESTED_PHP_VERSION', `$php -r 'echo PHP_VERSION;'`);
+ define('TESTED_PHP_VERSION', `$php -r echo PHP_VERSION;`);
- $unicode = `$php $pass_options $info_params -r 'echo
ini_get(unicode.semantics);'`;
+ $unicode = `$php $pass_options $info_params -r echo
ini_get('unicode.semantics');`;
define('TESTED_UNICODE', strcasecmp($unicode,on) == 0 || $unicode ==
1);
// load list of enabled extensions
@@ -333,6 +333,7 @@
case 'N':
$unicode_and_native = false;
$unicode_testing = false;
+ $ini_overwrites[] =
'unicode.semantics=0';
break;
case '--no-clean':
$no_clean = true;
@@ -399,7 +400,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.297 $'.\n;
+ echo '$Revision: 1.298 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /win32/build Makefile
rrichards Sat Jul 22 13:13:18 2006 UTC Modified files: /php-src/win32/buildMakefile Log: enable native and unicode tests add ntest and utest build targets http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.37r2=1.38diff_format=u Index: php-src/win32/build/Makefile diff -u php-src/win32/build/Makefile:1.37 php-src/win32/build/Makefile:1.38 --- php-src/win32/build/Makefile:1.37 Mon Apr 10 15:09:15 2006 +++ php-src/win32/build/MakefileSat Jul 22 13:13:18 2006 @@ -14,7 +14,7 @@ # | Author: Wez Furlong [EMAIL PROTECTED] | # +--+ # -# $Id: Makefile,v 1.37 2006/04/10 15:09:15 sniper Exp $ +# $Id: Makefile,v 1.38 2006/07/22 13:13:18 rrichards Exp $ # This is the makefile template for the win32 build CC=$(CL) @@ -90,7 +90,19 @@ test: test_suite_uses_lame_env_vars.bat set TEST_PHP_EXECUTABLE=$(BUILD_DIR)\php.exe -$(BUILD_DIR)\php.exe -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) +$(BUILD_DIR)\php.exe -d open_basedir= -d output_buffering=0 run-tests.php -U $(TESTS) +NOKEEP + +utest: + test_suite_uses_lame_env_vars.bat +set TEST_PHP_EXECUTABLE=$(BUILD_DIR)\php.exe +$(BUILD_DIR)\php.exe -d open_basedir= -d output_buffering=0 run-tests.php -u $(TESTS) +NOKEEP + +ntest: + test_suite_uses_lame_env_vars.bat +set TEST_PHP_EXECUTABLE=$(BUILD_DIR)\php.exe +$(BUILD_DIR)\php.exe -d open_basedir= -d output_buffering=0 run-tests.php -N $(TESTS) NOKEEP build-snap: generated_files -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter sanitizing_filters.c
pajoye Sat Jul 22 13:01:03 2006 UTC
Modified files:
/php-src/ext/filter sanitizing_filters.c
Log:
- MFB: fix compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/sanitizing_filters.c?r1=1.14r2=1.15diff_format=u
Index: php-src/ext/filter/sanitizing_filters.c
diff -u php-src/ext/filter/sanitizing_filters.c:1.14
php-src/ext/filter/sanitizing_filters.c:1.15
--- php-src/ext/filter/sanitizing_filters.c:1.14Sat Jul 22 12:54:05 2006
+++ php-src/ext/filter/sanitizing_filters.c Sat Jul 22 13:01:03 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sanitizing_filters.c,v 1.14 2006/07/22 12:54:05 nlopess Exp $ */
+/* $Id: sanitizing_filters.c,v 1.15 2006/07/22 13:01:03 pajoye Exp $ */
#include php_filter.h
#include filter_private.h
@@ -303,13 +303,13 @@
/* depending on flags, strip '.', 'e', ,, ' */
if (flags FILTER_FLAG_ALLOW_FRACTION) {
- filter_map_update(map, 2, (unsigned char *) .);
+ filter_map_update(map, 2, (const unsigned char *) .);
}
if (flags FILTER_FLAG_ALLOW_THOUSAND) {
- filter_map_update(map, 3, (unsigned char *) ,);
+ filter_map_update(map, 3, (const unsigned char *) ,);
}
if (flags FILTER_FLAG_ALLOW_SCIENTIFIC) {
- filter_map_update(map, 4, (unsigned char *) eE);
+ filter_map_update(map, 4, (const unsigned char *) eE);
}
filter_map_apply(value, map);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/gd/tests dashedlines.phpt lines.phpt
nlopess Sat Jul 22 15:15:53 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/gd/tests dashedlines.phpt lines.phpt
Log:
dont create images in the php source root. output them instead
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/dashedlines.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/gd/tests/dashedlines.phpt
diff -u php-src/ext/gd/tests/dashedlines.phpt:1.1.2.2
php-src/ext/gd/tests/dashedlines.phpt:1.1.2.3
--- php-src/ext/gd/tests/dashedlines.phpt:1.1.2.2 Mon Jul 17 12:54:09 2006
+++ php-src/ext/gd/tests/dashedlines.phpt Sat Jul 22 15:15:53 2006
@@ -45,7 +45,11 @@
$p4 = imagecolorat($im, 2,3) == $b;
$p5 = imagecolorat($im, 2,4) == $r;
$p6 = imagecolorat($im, 2,5) == $b;
-imagepng($im, 'b.png');
+
+ob_start();
+imagepng($im);
+echo base64_encode(ob_get_clean()), \n;
+
if ($p1 $p2 $p3 $p4 $p5 $p6) {
echo Vertical: ok\n;
}
@@ -75,5 +79,6 @@
?
--EXPECTF--
Horizontal: ok
+iVBORw0KGgoNSUhEUgYGCAIAAABvrngfJ0lEQVQImWP8//8/AwMDAyMjA4TBwMAEoRgZoHyE0H8GRnQh0lUBABMDCgml3gqkAElFTkSuQmCC
Vertical: ok
Diagonal: ok
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/lines.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/gd/tests/lines.phpt
diff -u php-src/ext/gd/tests/lines.phpt:1.1.2.2
php-src/ext/gd/tests/lines.phpt:1.1.2.3
--- php-src/ext/gd/tests/lines.phpt:1.1.2.2 Mon Jul 17 12:54:09 2006
+++ php-src/ext/gd/tests/lines.phpt Sat Jul 22 15:15:53 2006
@@ -61,7 +61,10 @@
if ($p1 $p2 $p3) {
echo Diagonal: ok\n;
}
-imagepng($im, 'a.png');
+
+ob_start();
+imagepng($im);
+echo base64_encode(ob_get_clean()), \n;
// Outside
@@ -112,5 +115,6 @@
Horizontal: ok
Vertical: ok
Diagonal: ok
+iVBORw0KGgoNSUhEUgYGCAIAAABvrngfK0lEQVQImV3JsQ0AMAwCwYf9dyZFJOyE5qVDhBDWHCL0EPCpb7a6Z3WoegA14w0JDJlWpgBJRU5ErkJggg==
Outside 1: ok
Outside 2: ok
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd/tests dashedlines.phpt lines.phpt
nlopess Sat Jul 22 15:16:40 2006 UTC
Modified files:
/php-src/ext/gd/tests dashedlines.phpt lines.phpt
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/dashedlines.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/gd/tests/dashedlines.phpt
diff -u php-src/ext/gd/tests/dashedlines.phpt:1.1
php-src/ext/gd/tests/dashedlines.phpt:1.2
--- php-src/ext/gd/tests/dashedlines.phpt:1.1 Thu Dec 22 23:22:26 2005
+++ php-src/ext/gd/tests/dashedlines.phpt Sat Jul 22 15:16:40 2006
@@ -45,7 +45,11 @@
$p4 = imagecolorat($im, 2,3) == $b;
$p5 = imagecolorat($im, 2,4) == $r;
$p6 = imagecolorat($im, 2,5) == $b;
-imagepng($im, 'b.png');
+
+ob_start();
+imagepng($im);
+echo base64_encode(ob_get_clean()), \n;
+
if ($p1 $p2 $p3 $p4 $p5 $p6) {
echo Vertical: ok\n;
}
@@ -75,5 +79,6 @@
?
--EXPECTF--
Horizontal: ok
+iVBORw0KGgoNSUhEUgYGCAIAAABvrngfJ0lEQVQImWP8//8/AwMDAyMjA4TBwMAEoRgZoHyE0H8GRnQh0lUBABMDCgml3gqkAElFTkSuQmCC
Vertical: ok
Diagonal: ok
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/lines.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/gd/tests/lines.phpt
diff -u php-src/ext/gd/tests/lines.phpt:1.1 php-src/ext/gd/tests/lines.phpt:1.2
--- php-src/ext/gd/tests/lines.phpt:1.1 Thu Dec 22 23:22:26 2005
+++ php-src/ext/gd/tests/lines.phpt Sat Jul 22 15:16:40 2006
@@ -61,7 +61,10 @@
if ($p1 $p2 $p3) {
echo Diagonal: ok\n;
}
-imagepng($im, 'a.png');
+
+ob_start();
+imagepng($im);
+echo base64_encode(ob_get_clean()), \n;
// Outside
@@ -112,5 +115,6 @@
Horizontal: ok
Vertical: ok
Diagonal: ok
+iVBORw0KGgoNSUhEUgYGCAIAAABvrngfK0lEQVQImV3JsQ0AMAwCwYf9dyZFJOyE5qVDhBDWHCL0EPCpb7a6Z3WoegA14w0JDJlWpgBJRU5ErkJggg==
Outside 1: ok
Outside 2: ok
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json JSON_parser.c json.c
nlopess Sat Jul 22 15:23:23 2006 UTC
Modified files:
/php-src/ext/json JSON_parser.c json.c
Log:
MFB
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.3 php-src/ext/json/JSON_parser.c:1.4
--- php-src/ext/json/JSON_parser.c:1.3 Thu Jul 20 09:18:46 2006
+++ php-src/ext/json/JSON_parser.c Sat Jul 22 15:23:23 2006
@@ -139,7 +139,7 @@
This table maps the 128 ASCII characters into the 32 character classes.
The remaining Unicode characters should be mapped to S_ETC.
*/
-static int ascii_class[128] = {
+static const int ascii_class[128] = {
S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR,
S_ERR, S_WSP, S_WSP, S_ERR, S_ERR, S_WSP, S_ERR, S_ERR,
S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR,
@@ -168,7 +168,7 @@
0 and 29. An action is a negative number between -1 and -9. A JSON text is
accepted if the end of the text is in state 9 and mode is MODE_DONE.
*/
-static int state_transition_table[30][31] = {
+static const int state_transition_table[30][31] = {
/* 0*/ { 0,
0,-8,-1,-6,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
/* 1*/ { 1, 1,-1,-9,-1,-1,-1,-1,
3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
/* 2*/ { 2, 2,-8,-1,-6,-5,-1,-1,
3,-1,-1,-1,20,-1,21,22,-1,-1,-1,-1,-1,13,-1,17,-1,-1,10,-1,-1,-1,-1},
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.13 php-src/ext/json/json.c:1.14
--- php-src/ext/json/json.c:1.13Thu Jul 20 09:33:15 2006
+++ php-src/ext/json/json.c Sat Jul 22 15:23:23 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.13 2006/07/20 09:33:15 tony2001 Exp $ */
+/* $Id: json.c,v 1.14 2006/07/22 15:23:23 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -33,7 +33,7 @@
/* If you declare any globals in php_json.h uncomment this:
ZEND_DECLARE_MODULE_GLOBALS(json)
*/
-static char digits[] = 0123456789abcdef;
+static const char digits[] = 0123456789abcdef;
/* {{{ json_functions[]
*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/json config.w32
rrichards Sat Jul 22 15:32:17 2006 UTC
Modified files:
/php-src/ext/json config.w32
Log:
enable by default
http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.w32?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/json/config.w32
diff -u php-src/ext/json/config.w32:1.2 php-src/ext/json/config.w32:1.3
--- php-src/ext/json/config.w32:1.2 Tue Jan 31 08:59:06 2006
+++ php-src/ext/json/config.w32 Sat Jul 22 15:32:17 2006
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.2 2006/01/31 08:59:06 omar Exp $
+// $Id: config.w32,v 1.3 2006/07/22 15:32:17 rrichards Exp $
// vim:ft=javascript
-ARG_WITH(json, JavaScript Object Serialization support, no);
+ARG_ENABLE(json, JavaScript Object Serialization support, yes);
if (PHP_JSON != no) {
EXTENSION('json', 'json.c', PHP_JSON_SHARED, );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json config.w32
rrichards Sat Jul 22 15:33:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json config.w32
Log:
MFH: enable by default
http://cvs.php.net/viewvc.cgi/php-src/ext/json/config.w32?r1=1.2r2=1.2.2.1diff_format=u
Index: php-src/ext/json/config.w32
diff -u php-src/ext/json/config.w32:1.2 php-src/ext/json/config.w32:1.2.2.1
--- php-src/ext/json/config.w32:1.2 Tue Jan 31 08:59:06 2006
+++ php-src/ext/json/config.w32 Sat Jul 22 15:33:02 2006
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.2 2006/01/31 08:59:06 omar Exp $
+// $Id: config.w32,v 1.2.2.1 2006/07/22 15:33:02 rrichards Exp $
// vim:ft=javascript
-ARG_WITH(json, JavaScript Object Serialization support, no);
+ARG_ENABLE(json, JavaScript Object Serialization support, yes);
if (PHP_JSON != no) {
EXTENSION('json', 'json.c', PHP_JSON_SHARED, );
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/json JSON_parser.c json.c
nlopess Sat Jul 22 15:22:56 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json JSON_parser.c json.c
Log:
more const keywording
http://cvs.php.net/viewvc.cgi/php-src/ext/json/JSON_parser.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/json/JSON_parser.c
diff -u php-src/ext/json/JSON_parser.c:1.1.2.2
php-src/ext/json/JSON_parser.c:1.1.2.3
--- php-src/ext/json/JSON_parser.c:1.1.2.2 Thu Jul 20 09:19:02 2006
+++ php-src/ext/json/JSON_parser.c Sat Jul 22 15:22:56 2006
@@ -139,7 +139,7 @@
This table maps the 128 ASCII characters into the 32 character classes.
The remaining Unicode characters should be mapped to S_ETC.
*/
-static int ascii_class[128] = {
+static const int ascii_class[128] = {
S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR,
S_ERR, S_WSP, S_WSP, S_ERR, S_ERR, S_WSP, S_ERR, S_ERR,
S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR, S_ERR,
@@ -168,7 +168,7 @@
0 and 29. An action is a negative number between -1 and -9. A JSON text is
accepted if the end of the text is in state 9 and mode is MODE_DONE.
*/
-static int state_transition_table[30][31] = {
+static const int state_transition_table[30][31] = {
/* 0*/ { 0,
0,-8,-1,-6,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
/* 1*/ { 1, 1,-1,-9,-1,-1,-1,-1,
3,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1},
/* 2*/ { 2, 2,-8,-1,-6,-5,-1,-1,
3,-1,-1,-1,20,-1,21,22,-1,-1,-1,-1,-1,13,-1,17,-1,-1,10,-1,-1,-1,-1},
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.4r2=1.9.2.5diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.4 php-src/ext/json/json.c:1.9.2.5
--- php-src/ext/json/json.c:1.9.2.4 Thu Jul 20 09:33:28 2006
+++ php-src/ext/json/json.c Sat Jul 22 15:22:56 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: json.c,v 1.9.2.4 2006/07/20 09:33:28 tony2001 Exp $ */
+/* $Id: json.c,v 1.9.2.5 2006/07/22 15:22:56 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -33,7 +33,7 @@
/* If you declare any globals in php_json.h uncomment this:
ZEND_DECLARE_MODULE_GLOBALS(json)
*/
-static char digits[] = 0123456789abcdef;
+static const char digits[] = 0123456789abcdef;
/* {{{ json_functions[]
*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c
andrei Sat Jul 22 16:58:07 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c
Log:
Matt should be happy now.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.5r2=1.308.2.21.2.6diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.5
php-src/ext/standard/array.c:1.308.2.21.2.6
--- php-src/ext/standard/array.c:1.308.2.21.2.5 Fri Jul 21 23:54:19 2006
+++ php-src/ext/standard/array.cSat Jul 22 16:58:06 2006
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.5 2006/07/21 23:54:19 andrei Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.6 2006/07/22 16:58:06 andrei Exp $ */
#include php.h
#include php_ini.h
@@ -4522,7 +4522,7 @@
/* }}} */
/* {{{ proto array array_combine(array keys, array values)
- Creates an array by using the elements of the first parameter as keys and
the elements of the second as corresponding keys */
+ Creates an array by using the elements of the first parameter as keys and
the elements of the second as the corresponding keys */
PHP_FUNCTION(array_combine)
{
zval *values, *keys;
@@ -4551,7 +4551,7 @@
zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void
**)entry_values, pos_values) == SUCCESS) {
if (Z_TYPE_PP(entry_keys) == IS_STRING) {
zval_add_ref(entry_values);
- add_assoc_zval(return_value, Z_STRVAL_PP(entry_keys),
*entry_values);
+ add_assoc_zval_ex(return_value,
Z_STRVAL_PP(entry_keys), Z_STRLEN_PP(entry_keys), *entry_values);
} else if (Z_TYPE_PP(entry_keys) == IS_LONG) {
zval_add_ref(entry_values);
add_index_zval(return_value, Z_LVAL_PP(entry_keys),
*entry_values);
--
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 /main rfc1867.c rfc1867.h
How about patch for HEAD? -Andrei On Jul 22, 2006, at 9:38 AM, Stefan Esser wrote: sesser Sat Jul 22 16:38:29 2006 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/main rfc1867.c rfc1867.h Log: Added RFC1867 fileupload processing hook. sesser-20060722163829.txt -- 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/xmlreader php_xmlreader.c
andrei Sat Jul 22 17:40:08 2006 UTC
Modified files:
/php-src/ext/xmlreader php_xmlreader.c
Log:
Mark XMLReader methods with U.
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.36r2=1.37diff_format=u
Index: php-src/ext/xmlreader/php_xmlreader.c
diff -u php-src/ext/xmlreader/php_xmlreader.c:1.36
php-src/ext/xmlreader/php_xmlreader.c:1.37
--- php-src/ext/xmlreader/php_xmlreader.c:1.36 Fri Jul 21 02:09:28 2006
+++ php-src/ext/xmlreader/php_xmlreader.c Sat Jul 22 17:40:08 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_xmlreader.c,v 1.36 2006/07/21 02:09:28 rrichards Exp $ */
+/* $Id: php_xmlreader.c,v 1.37 2006/07/22 17:40:08 andrei Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -566,7 +566,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::close()
+/* {{{ proto boolean XMLReader::close() U
Closes xmlreader - current frees resources until xmlTextReaderClose is fixed
in libxml */
PHP_METHOD(xmlreader, close)
{
@@ -584,7 +584,7 @@
}
/* }}} */
-/* {{{ proto string XMLReader::getAttribute(string name)
+/* {{{ proto string XMLReader::getAttribute(string name) U
Get value of an attribute from current element */
PHP_METHOD(xmlreader, getAttribute)
{
@@ -592,7 +592,7 @@
}
/* }}} */
-/* {{{ proto string XMLReader::getAttributeNo(int index)
+/* {{{ proto string XMLReader::getAttributeNo(int index) U
Get value of an attribute at index from current element */
PHP_METHOD(xmlreader, getAttributeNo)
{
@@ -621,7 +621,7 @@
}
/* }}} */
-/* {{{ proto string XMLReader::getAttributeNs(string name, string namespaceURI)
+/* {{{ proto string XMLReader::getAttributeNs(string name, string
namespaceURI) U
Get value of a attribute via name and namespace from current element */
PHP_METHOD(xmlreader, getAttributeNs)
{
@@ -662,7 +662,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::getParserProperty(int property)
+/* {{{ proto boolean XMLReader::getParserProperty(int property) U
Indicates whether given property (one of the parser option constants) is set
or not on parser */
PHP_METHOD(xmlreader, getParserProperty)
{
@@ -690,7 +690,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::isValid()
+/* {{{ proto boolean XMLReader::isValid() U
Returns boolean indicating if parsed document is valid or not.
Must set XMLREADER_LOADDTD or XMLREADER_VALIDATE parser option prior to the
first call to read
or this method will always return FALSE */
@@ -700,7 +700,7 @@
}
/* }}} */
-/* {{{ proto string XMLReader::lookupNamespace(string prefix)
+/* {{{ proto string XMLReader::lookupNamespace(string prefix) U
Return namespaceURI for associated prefix on current node */
PHP_METHOD(xmlreader, lookupNamespace)
{
@@ -708,7 +708,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::moveToAttribute(string name)
+/* {{{ proto boolean XMLReader::moveToAttribute(string name) U
Positions reader at specified attribute - Returns TRUE on success and FALSE on
failure */
PHP_METHOD(xmlreader, moveToAttribute)
{
@@ -746,7 +746,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::moveToAttributeNo(int index)
+/* {{{ proto boolean XMLReader::moveToAttributeNo(int index) U
Positions reader at attribute at spcecified index.
Returns TRUE on success and FALSE on failure */
PHP_METHOD(xmlreader, moveToAttributeNo)
@@ -774,7 +774,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::moveToAttributeNs(string name, string
namespaceURI)
+/* {{{ proto boolean XMLReader::moveToAttributeNs(string name, string
namespaceURI) U
Positions reader at attribute spcified by name and namespaceURI.
Returns TRUE on success and FALSE on failure */
PHP_METHOD(xmlreader, moveToAttributeNs)
@@ -814,7 +814,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::moveToElement()
+/* {{{ proto boolean XMLReader::moveToElement() U
Moves the position of the current instance to the node that contains the
current Attribute node. */
PHP_METHOD(xmlreader, moveToElement)
{
@@ -822,7 +822,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::moveToFirstAttribute()
+/* {{{ proto boolean XMLReader::moveToFirstAttribute() U
Moves the position of the current instance to the first attribute associated
with the current node. */
PHP_METHOD(xmlreader, moveToFirstAttribute)
{
@@ -830,7 +830,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::moveToNextAttribute()
+/* {{{ proto boolean XMLReader::moveToNextAttribute() U
Moves the position of the current instance to the next attribute associated
with the current node. */
PHP_METHOD(xmlreader, moveToNextAttribute)
{
@@ -838,7 +838,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::read()
+/* {{{ proto boolean XMLReader::read() U
Moves the position of the current instance to the next node in the stream. */
PHP_METHOD(xmlreader, read)
{
@@ -863,7 +863,7 @@
}
/* }}} */
-/* {{{ proto boolean XMLReader::next([string localname])
+/* {{{ proto
Re: [PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main rfc1867.c rfc1867.h
Andrei Zmievski schrieb: How about patch for HEAD? HEAD is lightyears away from beeing stable. Until PHP 5.2.0 is released the fileupload hook will be tested by myself (because of the extensions I write) and when I am 100% sure that it is stable I will commit it against HEAD. I don't want to commit the code now to HEAD and later realise that there was some error and commit every fix to it to several branches. Stefan -- 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 /main rfc1867.c rfc1867.h
Hello Stefan, well the policy is you commit to HEAD first so that HEAD and base do not get out of synch. For PDO we already have the situation and it will most likely require us to drop all of PDO in HEAD and start adding unicode from scratch without loosing new stuff in HEAD. So please always do HEAD first, just like everyone else. Also patching 5.2 now with non tested stuff that brings quite a bunch of changes is not ok (and not committing to head along with this reply makes it look quit epremature), or haven't you learend from the other ongoing threads? best regards marcus Saturday, July 22, 2006, 1:03:19 PM, you wrote: Andrei Zmievski schrieb: How about patch for HEAD? HEAD is lightyears away from beeing stable. Until PHP 5.2.0 is released the fileupload hook will be tested by myself (because of the extensions I write) and when I am 100% sure that it is stable I will commit it against HEAD. I don't want to commit the code now to HEAD and later realise that there was some error and commit every fix to it to several branches. Stefan Best regards, Marcus -- 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 /main rfc1867.c rfc1867.h
Hello, well the policy is you commit to HEAD first so that HEAD and base do not get out of synch. For PDO we already have the situation and it will mos Yeah we all know how well commiting to HEAD and then merging the same untested code to the branches work. We have seen this commit policy in action with the latest PHP 5.1.3 releases. At the moment there is no point in commiting stuff to HEAD first and then merging it to branch. HEAD is completely different and needs completely differnt code. Chances are high that the fileupload code doesn't work at all in PHP6 after the unicode changes. I rather like to test new code against stable code branches instead of testing it against unstable branches that could blow up in my face. The time you waste on questioning my development decisions you better spend on fixing your own bugs, that I had to find for you in the past. (f.e. checking return values of calls to base64_decode() in 'data' URL shemes...) Stefan -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
