[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Oct 18 01:36:27 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2135r2=1.2136ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2135 php-src/ChangeLog:1.2136 --- php-src/ChangeLog:1.2135Mon Oct 17 01:44:34 2005 +++ php-src/ChangeLog Tue Oct 18 01:36:23 2005 @@ -1,3 +1,100 @@ +2005-10-17 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + configure.in + main/php_version.h: + Back to dev + +* (PHP_5_1) + NEWS + configure.in + main/php_version.h: + 5.1.0RC3 + +2005-10-17 Rolland Santimano [EMAIL PROTECTED] + +* ext/standard/string.c: + - Unicode impl of stripos() + +* ext/standard/string.c: + - Unicode impl of strrpos() + +2005-10-17 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + NEWS + ext/pspell/pspell.c + ext/pspell/pspell.c: + MFH: Properly fixed bug #34456 (original patch completely reverted). + +* ext/pspell/pspell.c: + Properly fixed bug #34456 (original patch completely reverted). + +2005-10-17 Derick Rethans [EMAIL PROTECTED] + +* ext/standard/var.c + ext/standard/tests/array/007.phpt + ext/standard/tests/array/array_intersect_1.phpt + ext/standard/tests/array/var_export.phpt + ext/standard/tests/array/var_export3.phpt: + - MF51: Fixed bug #29361 (var_export() producing invalid code). + +* ext/standard/tests/array/var_export3.phpt + ext/standard/tests/array/var_export3.phpt: + + file var_export3.phpt was initially added on branch PHP_5_1. + +* (PHP_5_1) + NEWS + ext/standard/var.c + ext/standard/tests/array/007.phpt + ext/standard/tests/array/array_intersect_1.phpt + ext/standard/tests/array/var_export.phpt: + - Fixed bug #29361 (var_export() producing invalid code). (Derick) + +2005-10-17 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS + ext/sqlite/sqlite.c: + MFH: Fixed bug #34884 (Possible crash in ext/sqlite when sqlite.assoc_case + is being used). + +* ext/sqlite/sqlite.c: + Fixed bug #34884 (Possible crash in ext/sqlite when sqlite.assoc_case is + being used). + +2005-10-17 Dmitry Stogov [EMAIL PROTECTED] + +* (PHP_5_1) + NEWS + ZendEngine2/zend_compile.c + ZendEngine2/zend_compile.c + ZendEngine2/zend_language_parser.y + ZendEngine2/zend_language_parser.y + ZendEngine2/tests/bug34873.phpt: + Fixed bug #34873 (Segmentation Fault on foreach in object) + +2005-10-17 Derick Rethans [EMAIL PROTECTED] + +* ZendEngine2/zend_compile.c + tests/lang/type_hints_002.phpt + tests/lang/type_hints_003.phpt: + - Make sure that typehints for classes can only accept = NULL as default +value. + +2005-10-17 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + ext/curl/curl.c + ext/curl/interface.c + ext/curl/interface.c: + MFH: Further URL validations in safe_mode/open_basedir configs. + +* ext/curl/interface.c: + Further URL validations in safe_mode/open_basedir configs. + 2005-10-16 Jani Taskinen [EMAIL PROTECTED] * Makefile.frag @@ -13991,7 +14088,7 @@ * (PHP_4_3) ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2135 2005/10/17 05:44:34 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2136 2005/10/18 05:36:23 changelog Exp $ tag * (PHP_5_0) ext/standard/url_scanner_ex.c: @@ -17392,7 +17489,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.2135 2005/10/17 05:44:34 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.2136 2005/10/18 05:36:23 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -17873,7 +17970,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.2135 2005/10/17 05:44:34 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.2136 2005/10/18 05:36:23 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -19347,7 +19444,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.2135 2005/10/17 05:44:34 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.2136 2005/10/18 05:36:23 changelog Exp $ tag * ext/standard/credits_ext.h ext/standard/credits_sapi.h:
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Oct 18 01:36:35 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.794r2=1.795ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.794 ZendEngine2/ChangeLog:1.795 --- ZendEngine2/ChangeLog:1.794 Mon Oct 17 01:45:46 2005 +++ ZendEngine2/ChangeLog Tue Oct 18 01:36:34 2005 @@ -1,3 +1,18 @@ +2005-10-17 Dmitry Stogov [EMAIL PROTECTED] + +* zend_compile.c + zend_compile.c + zend_language_parser.y + zend_language_parser.y + tests/bug34873.phpt: + Fixed bug #34873 (Segmentation Fault on foreach in object) + +2005-10-17 Derick Rethans [EMAIL PROTECTED] + +* zend_compile.c: + - Make sure that typehints for classes can only accept = NULL as default +value. + 2005-10-16 Marcus Boerger [EMAIL PROTECTED] * zend_reflection_api.c: @@ -10708,7 +10723,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.794 2005/10/17 05:45:46 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.795 2005/10/18 05:36:34 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -12432,7 +12447,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.794 2005/10/17 05:45:46 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.795 2005/10/18 05:36:34 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src /ext/sqlite sqlite.c
iliaa Mon Oct 17 10:29:24 2005 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fixed bug #34884 (Possible crash in ext/sqlite when sqlite.assoc_case is
being used).
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.172r2=1.173ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.172 php-src/ext/sqlite/sqlite.c:1.173
--- php-src/ext/sqlite/sqlite.c:1.172 Thu Sep 8 17:07:26 2005
+++ php-src/ext/sqlite/sqlite.c Mon Oct 17 10:29:20 2005
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.172 2005/09/08 21:07:26 iliaa Exp $
+ $Id: sqlite.c,v 1.173 2005/10/17 14:29:20 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1126,7 +1126,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.172 2005/09/08 21:07:26 iliaa Exp
$);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.173 2005/10/17 14:29:20 iliaa Exp
$);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1441,14 +1441,13 @@
/* first row - lets copy the column names */
rres-col_names = safe_emalloc(rres-ncolumns, sizeof(char *),
0);
for (i = 0; i rres-ncolumns; i++) {
- colname = (char*)colnames[i];
+ rres-col_names[i] = estrdup((char*)colnames[i]);
if (SQLITE_G(assoc_case) == 1) {
- php_sqlite_strtoupper(colname);
+ php_sqlite_strtoupper(rres-col_names[i]);
} else if (SQLITE_G(assoc_case) == 2) {
- php_sqlite_strtolower(colname);
+ php_sqlite_strtolower(rres-col_names[i]);
}
- rres-col_names[i] = estrdup(colname);
}
if (!rres-buffered) {
/* non buffered mode - also fetch memory for on single
row */
@@ -1687,7 +1686,7 @@
array_init(return_value);
for (i = 0; i ncols; i++) {
- char *colname = (char *)colnames[i];
+ char *colname = estrdup((char *)colnames[i]);
if (SQLITE_G(assoc_case) == 1) {
php_sqlite_strtoupper(colname);
@@ -1717,6 +1716,7 @@
add_index_string(return_value, i,
colnames[ncols + i] ? (char *)colnames[ncols + i] : , 1);
}
}
+ efree(colname);
}
done:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/sqlite sqlite.c
iliaa Mon Oct 17 10:30:36 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-srcNEWS
/php-src/ext/sqlite sqlite.c
Log:
MFH: Fixed bug #34884 (Possible crash in ext/sqlite when sqlite.assoc_case
is being used).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.132r2=1.2027.2.133ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.132 php-src/NEWS:1.2027.2.133
--- php-src/NEWS:1.2027.2.132 Mon Oct 17 03:56:55 2005
+++ php-src/NEWSMon Oct 17 10:30:33 2005
@@ -2,6 +2,8 @@
|||
?? Oct 2005, PHP 5.1 Release Candidate 3
- Fixed bug #34873 (Segmentation Fault on foreach in object). (Dmitry)
+- Fixed bug #34884 (Possible crash in ext/sqlite when sqlite.assoc_case is
+ being used). (Tony,Ilia)
14 Oct 2005, PHP 5.1 Release Candidate 2
- Changed SQLite extension to be a shared module in Windows distribution.
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.166.2.1r2=1.166.2.2ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.1
php-src/ext/sqlite/sqlite.c:1.166.2.2
--- php-src/ext/sqlite/sqlite.c:1.166.2.1 Thu Sep 8 17:07:40 2005
+++ php-src/ext/sqlite/sqlite.c Mon Oct 17 10:30:35 2005
@@ -17,7 +17,7 @@
| Marcus Boerger [EMAIL PROTECTED] |
+--+
- $Id: sqlite.c,v 1.166.2.1 2005/09/08 21:07:40 iliaa Exp $
+ $Id: sqlite.c,v 1.166.2.2 2005/10/17 14:30:35 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1125,7 +1125,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, SQLite support, enabled);
- php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.1 2005/09/08 21:07:40 iliaa
Exp $);
+ php_info_print_table_row(2, PECL Module version,
PHP_SQLITE_MODULE_VERSION $Id: sqlite.c,v 1.166.2.2 2005/10/17 14:30:35 iliaa
Exp $);
php_info_print_table_row(2, SQLite Library, sqlite_libversion());
php_info_print_table_row(2, SQLite Encoding, sqlite_libencoding());
php_info_print_table_end();
@@ -1440,14 +1440,13 @@
/* first row - lets copy the column names */
rres-col_names = safe_emalloc(rres-ncolumns, sizeof(char *),
0);
for (i = 0; i rres-ncolumns; i++) {
- colname = (char*)colnames[i];
+ rres-col_names[i] = estrdup((char*)colnames[i]);
if (SQLITE_G(assoc_case) == 1) {
- php_sqlite_strtoupper(colname);
+ php_sqlite_strtoupper(rres-col_names[i]);
} else if (SQLITE_G(assoc_case) == 2) {
- php_sqlite_strtolower(colname);
+ php_sqlite_strtolower(rres-col_names[i]);
}
- rres-col_names[i] = estrdup(colname);
}
if (!rres-buffered) {
/* non buffered mode - also fetch memory for on single
row */
@@ -1686,16 +1685,17 @@
array_init(return_value);
for (i = 0; i ncols; i++) {
- char *colname = (char *)colnames[i];
+ if (result_type == PHPSQLITE_ASSOC) {
+ char *colname = estrdup((char *)colnames[i]);
- if (SQLITE_G(assoc_case) == 1) {
- php_sqlite_strtoupper(colname);
- } else if (SQLITE_G(assoc_case) == 2) {
- php_sqlite_strtolower(colname);
- }
+ if (SQLITE_G(assoc_case) == 1) {
+ php_sqlite_strtoupper(colname);
+ } else if (SQLITE_G(assoc_case) == 2) {
+ php_sqlite_strtolower(colname);
+ }
- if (result_type == PHPSQLITE_ASSOC) {
add_assoc_string(return_value, colname, colnames[ncols
+ i] ? (char *)colnames[ncols + i] : , 1);
+ efree(colname);
}
if (result_type == PHPSQLITE_NUM) {
add_index_string(return_value, i, colnames[ncols + i] ?
(char *)colnames[ncols + i] : , 1);
--
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_1) / NEWS
When making RCs in the 4.X branch we've always separated RCs and then merged them into a single entry when the final release was made. This allowed quick determination what changes were made between each RC. Ilia Jani Taskinen wrote: sniperSun Oct 16 13:54:39 2005 EDT Modified files: (Branch: PHP_5_1) /php-src NEWS Log: NEWS file is about changes between releases. (RCs are not releases..) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/standard var.c /ext/standard/tests/array 007.phpt array_intersect_1.phpt var_export.phpt var_export3.phpt
derick Mon Oct 17 10:38:15 2005 EDT
Added files: (Branch: PHP_5_1)
/php-src/ext/standard/tests/array var_export3.phpt
Modified files:
/php-srcNEWS
/php-src/ext/standard var.c
/php-src/ext/standard/tests/array 007.phpt array_intersect_1.phpt
var_export.phpt
Log:
- Fixed bug #29361 (var_export() producing invalid code). (Derick)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.133r2=1.2027.2.134ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.133 php-src/NEWS:1.2027.2.134
--- php-src/NEWS:1.2027.2.133 Mon Oct 17 10:30:33 2005
+++ php-src/NEWSMon Oct 17 10:38:07 2005
@@ -3,7 +3,8 @@
?? Oct 2005, PHP 5.1 Release Candidate 3
- Fixed bug #34873 (Segmentation Fault on foreach in object). (Dmitry)
- Fixed bug #34884 (Possible crash in ext/sqlite when sqlite.assoc_case is
- being used). (Tony,Ilia)
+ being used). (Tony, Ilia)
+- Fixed bug #29361 (var_export() producing invalid code). (Derick)
14 Oct 2005, PHP 5.1 Release Candidate 2
- Changed SQLite extension to be a shared module in Windows distribution.
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.203.2.3r2=1.203.2.4ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.203.2.3
php-src/ext/standard/var.c:1.203.2.4
--- php-src/ext/standard/var.c:1.203.2.3Fri Sep 16 13:10:58 2005
+++ php-src/ext/standard/var.c Mon Oct 17 10:38:09 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var.c,v 1.203.2.3 2005/09/16 17:10:58 tony2001 Exp $ */
+/* $Id: var.c,v 1.203.2.4 2005/10/17 14:38:09 derick Exp $ */
@@ -352,18 +352,9 @@
if (hash_key-nKeyLength != 0) {
php_printf(%*c, level + 1, ' ');
zend_unmangle_property_name_ex(hash_key-arKey,
hash_key-nKeyLength, class_name, prop_name);
- if (class_name) {
- if (class_name[0] == '*') {
- php_printf(protected);
- } else {
- php_printf(private);
- }
- } else {
- php_printf(public);
- }
- php_printf( $%s = , prop_name);
+ php_printf( '%s' = , prop_name);
php_var_export(zv, level + 2 TSRMLS_CC);
- PUTS (;\n);
+ PUTS (,\n);
}
return 0;
}
@@ -414,7 +405,7 @@
php_printf(\n%*c, level - 1, ' ');
}
Z_OBJ_HANDLER(**struc, get_class_name)(*struc, class_name,
class_name_len, 0 TSRMLS_CC);
- php_printf (class %s {\n, class_name);
+ php_printf (%s::__set_state(array(\n, class_name);
efree(class_name);
if (myht) {
zend_hash_apply_with_arguments(myht,
(apply_func_args_t) php_object_element_export, 1, level);
@@ -422,7 +413,7 @@
if (level 1) {
php_printf(%*c, level - 1, ' ');
}
- PUTS(});
+ php_printf ()));
break;
default:
PUTS (NULL);
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/007.phpt?r1=1.9r2=1.9.4.1ty=u
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.9
php-src/ext/standard/tests/array/007.phpt:1.9.4.1
--- php-src/ext/standard/tests/array/007.phpt:1.9 Thu May 20 17:13:14 2004
+++ php-src/ext/standard/tests/array/007.phpt Mon Oct 17 10:38:10 2005
@@ -254,57 +254,57 @@
-=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
$a=array (
'0.1' =
- class cr {
-private $priv_member = 9;
-public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' = 9,
+ 'public_member' = 9,
+ )),
'0.5' =
- class cr {
-private $priv_member = 12;
-public $public_member = 12;
- },
+ cr::__set_state(array(
+ 'priv_member' = 12,
+ 'public_member' = 12,
+ )),
0 =
- class cr {
-private $priv_member = 23;
-public $public_member = 23;
- },
+ cr::__set_state(array(
+ 'priv_member' = 23,
+ 'public_member' = 23,
+ )),
1 =
- class cr {
-private $priv_member = 4;
-public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' = 4,
+ 'public_member' = 4,
+ )),
2 =
- class cr {
-private $priv_member = -15;
-public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' = -15,
+ 'public_member' = -15,
+ )),
);
$b=array (
'0.2' =
- class cr {
-private $priv_member = 9;
-public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' = 9,
+ 'public_member' = 9,
+ )),
'0.5' =
- class cr {
-private $priv_member = 22;
-public $public_member = 22;
- },
+
[PHP-CVS] cvs: php-src /ext/standard var.c /ext/standard/tests/array 007.phpt array_intersect_1.phpt var_export.phpt var_export3.phpt
derick Mon Oct 17 11:03:12 2005 EDT
Modified files:
/php-src/ext/standard var.c
/php-src/ext/standard/tests/array var_export3.phpt 007.phpt
array_intersect_1.phpt
var_export.phpt
Log:
- MF51: Fixed bug #29361 (var_export() producing invalid code).
http://cvs.php.net/diff.php/php-src/ext/standard/var.c?r1=1.214r2=1.215ty=u
Index: php-src/ext/standard/var.c
diff -u php-src/ext/standard/var.c:1.214 php-src/ext/standard/var.c:1.215
--- php-src/ext/standard/var.c:1.214Mon Sep 12 03:14:54 2005
+++ php-src/ext/standard/var.c Mon Oct 17 11:03:04 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: var.c,v 1.214 2005/09/12 07:14:54 dmitry Exp $ */
+/* $Id: var.c,v 1.215 2005/10/17 15:03:04 derick Exp $ */
@@ -497,18 +497,9 @@
if (hash_key-nKeyLength != 0) {
php_printf(%*c, level + 1, ' ');
zend_u_unmangle_property_name(hash_key-type,
hash_key-u.string, class_name, prop_name);
- if (class_name) {
- if (class_name[0] == '*') {
- php_printf(protected);
- } else {
- php_printf(private);
- }
- } else {
- php_printf(public);
- }
- php_printf( $%R = , hash_key-type, prop_name);
+ php_printf( '%R' = , hash_key-type, prop_name);
php_var_export(zv, level + 2 TSRMLS_CC);
- PUTS (;\n);
+ PUTS (,\n);
}
return 0;
}
@@ -564,7 +555,7 @@
php_printf(\n%*c, level - 1, ' ');
}
Z_OBJ_HANDLER(**struc, get_class_name)(*struc, class_name,
class_name_len, 0 TSRMLS_CC);
- php_printf (class %v {\n, class_name);
+ php_printf (%v::__set_state(array(\n, class_name);
efree(class_name);
if (myht) {
zend_hash_apply_with_arguments(myht,
(apply_func_args_t) php_object_element_export, 1, level);
@@ -572,7 +563,7 @@
if (level 1) {
php_printf(%*c, level - 1, ' ');
}
- PUTS(});
+ php_printf ()));
break;
default:
PUTS (NULL);
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/var_export3.phpt?r1=1.1r2=1.2ty=u
Index: php-src/ext/standard/tests/array/var_export3.phpt
diff -u /dev/null php-src/ext/standard/tests/array/var_export3.phpt:1.2
--- /dev/null Mon Oct 17 11:03:12 2005
+++ php-src/ext/standard/tests/array/var_export3.phpt Mon Oct 17 11:03:12 2005
@@ -0,0 +1,24 @@
+--TEST--
+var_export() and classes
+--FILE--
+?php
+class kake {
+ public $mann;
+ protected $kvinne;
+
+ function __construct()
+ {
+ $this-mann = 42;
+ $this-kvinne = 43;
+ }
+}
+
+$kake = new kake;
+
+var_export($kake);
+?
+--EXPECT--
+kake::__set_state(array(
+ 'mann' = 42,
+ 'kvinne' = 43,
+))
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/007.phpt?r1=1.11r2=1.12ty=u
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.11
php-src/ext/standard/tests/array/007.phpt:1.12
--- php-src/ext/standard/tests/array/007.phpt:1.11 Mon Aug 15 10:37:55 2005
+++ php-src/ext/standard/tests/array/007.phpt Mon Oct 17 11:03:12 2005
@@ -111,7 +111,7 @@
echo '$a='.var_export($a,TRUE).;\n;
echo '$b='.var_export($b,TRUE).;\n;
echo 'var_dump(array_diff_assoc($a, $b));'.\n;
-var_dump(@array_diff_assoc($a, $b));
+var_dump(array_diff_assoc($a, $b));
echo '$a='.var_export($a,TRUE).;\n;
@@ -254,57 +254,57 @@
-=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
$a=array (
'0.1' =
- class cr {
-private $priv_member = 9;
-public $public_member = 9;
- },
+ cr::__set_state(array(
+ 'priv_member' = 9,
+ 'public_member' = 9,
+ )),
'0.5' =
- class cr {
-private $priv_member = 12;
-public $public_member = 12;
- },
+ cr::__set_state(array(
+ 'priv_member' = 12,
+ 'public_member' = 12,
+ )),
0 =
- class cr {
-private $priv_member = 23;
-public $public_member = 23;
- },
+ cr::__set_state(array(
+ 'priv_member' = 23,
+ 'public_member' = 23,
+ )),
1 =
- class cr {
-private $priv_member = 4;
-public $public_member = 4;
- },
+ cr::__set_state(array(
+ 'priv_member' = 4,
+ 'public_member' = 4,
+ )),
2 =
- class cr {
-private $priv_member = -15;
-public $public_member = -15;
- },
+ cr::__set_state(array(
+ 'priv_member' = -15,
+ 'public_member' = -15,
+ )),
);
$b=array (
'0.2' =
- class cr {
-private $priv_member = 9;
-public $public_member = 9;
- },
+
[PHP-CVS] cvs: php-src /ext/pspell pspell.c
iliaa Mon Oct 17 11:29:56 2005 EDT
Modified files:
/php-src/ext/pspell pspell.c
Log:
Properly fixed bug #34456 (original patch completely reverted).
http://cvs.php.net/diff.php/php-src/ext/pspell/pspell.c?r1=1.46r2=1.47ty=u
Index: php-src/ext/pspell/pspell.c
diff -u php-src/ext/pspell/pspell.c:1.46 php-src/ext/pspell/pspell.c:1.47
--- php-src/ext/pspell/pspell.c:1.46Mon Sep 12 11:26:48 2005
+++ php-src/ext/pspell/pspell.c Mon Oct 17 11:29:55 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pspell.c,v 1.46 2005/09/12 15:26:48 iliaa Exp $ */
+/* $Id: pspell.c,v 1.47 2005/10/17 15:29:55 iliaa Exp $ */
#define IS_EXT_MODULE
@@ -101,6 +101,22 @@
delete_pspell_config(config);
}
+#define PSPELL_FETCH_CONFIG \
+ convert_to_long_ex(conf); \
+ config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), type);
\
+ if (config == NULL || type != le_pspell_config) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL config index, Z_LVAL_PP(conf)); \
+ RETURN_FALSE; \
+ } \
+
+#define PSPELL_FETCH_MANAGER \
+ convert_to_long_ex(scin); \
+ manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
\
+ if (!manager || type != le_pspell) {\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin)); \
+ RETURN_FALSE; \
+ } \
+
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(pspell)
@@ -352,13 +368,7 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(conf);
- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), type);
-
- if (config == NULL || type != le_pspell_config) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL config index, Z_LVAL_PP(conf));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_CONFIG;
ret = new_pspell_manager(config);
@@ -387,13 +397,9 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+
+ PSPELL_FETCH_MANAGER;
if(pspell_manager_check(manager, Z_STRVAL_PP(word))){
RETURN_TRUE;
@@ -419,13 +425,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_MANAGER;
array_init(return_value);
@@ -457,14 +458,9 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(miss);
convert_to_string_ex(corr);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_MANAGER;
pspell_manager_store_replacement(manager, Z_STRVAL_PP(miss),
Z_STRVAL_PP(corr));
if(pspell_manager_error_number(manager) == 0){
@@ -490,13 +486,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_MANAGER;
/*If the word is empty, we have to return; otherwise we'll segfault!
ouch!*/
if(Z_STRLEN_PP(word) == 0){
@@ -527,13 +518,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_MANAGER;
/*If the word is empty, we have to return; otherwise we'll segfault!
ouch!*/
if(Z_STRLEN_PP(word) == 0){
@@ -564,12 +550,7 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
-
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS /ext/pspell pspell.c
iliaa Mon Oct 17 11:31:11 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pspell pspell.c
/php-srcNEWS
Log:
MFH: Properly fixed bug #34456 (original patch completely reverted).
http://cvs.php.net/diff.php/php-src/ext/pspell/pspell.c?r1=1.45.2.1r2=1.45.2.2ty=u
Index: php-src/ext/pspell/pspell.c
diff -u php-src/ext/pspell/pspell.c:1.45.2.1
php-src/ext/pspell/pspell.c:1.45.2.2
--- php-src/ext/pspell/pspell.c:1.45.2.1Mon Sep 12 11:39:14 2005
+++ php-src/ext/pspell/pspell.c Mon Oct 17 11:31:10 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pspell.c,v 1.45.2.1 2005/09/12 15:39:14 iliaa Exp $ */
+/* $Id: pspell.c,v 1.45.2.2 2005/10/17 15:31:10 iliaa Exp $ */
#define IS_EXT_MODULE
@@ -101,6 +101,22 @@
delete_pspell_config(config);
}
+#define PSPELL_FETCH_CONFIG \
+ convert_to_long_ex(conf); \
+ config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), type);
\
+ if (config == NULL || type != le_pspell_config) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL config index, Z_LVAL_PP(conf)); \
+ RETURN_FALSE; \
+ } \
+
+#define PSPELL_FETCH_MANAGER \
+ convert_to_long_ex(scin); \
+ manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
\
+ if (!manager || type != le_pspell) {\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin)); \
+ RETURN_FALSE; \
+ } \
+
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(pspell)
@@ -352,13 +368,7 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(conf);
- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), type);
-
- if (config == NULL || type != le_pspell_config) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL config index, Z_LVAL_PP(conf));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_CONFIG;
ret = new_pspell_manager(config);
@@ -387,13 +397,9 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+
+ PSPELL_FETCH_MANAGER;
if(pspell_manager_check(manager, Z_STRVAL_PP(word))){
RETURN_TRUE;
@@ -419,13 +425,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_MANAGER;
array_init(return_value);
@@ -457,14 +458,9 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(miss);
convert_to_string_ex(corr);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_MANAGER;
pspell_manager_store_replacement(manager, Z_STRVAL_PP(miss),
Z_STRVAL_PP(corr));
if(pspell_manager_error_number(manager) == 0){
@@ -490,13 +486,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_MANAGER;
/*If the word is empty, we have to return; otherwise we'll segfault!
ouch!*/
if(Z_STRLEN_PP(word) == 0){
@@ -527,13 +518,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+ PSPELL_FETCH_MANAGER;
/*If the word is empty, we have to return; otherwise we'll segfault!
ouch!*/
if(Z_STRLEN_PP(word) == 0){
@@ -564,12 +550,7 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
- manager = (PspellManager
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /ext/pspell pspell.c
iliaa Mon Oct 17 11:43:14 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/pspell pspell.c
/php-srcNEWS
Log:
MFH: Properly fixed bug #34456 (original patch completely reverted).
http://cvs.php.net/diff.php/php-src/ext/pspell/pspell.c?r1=1.28.8.5.4.1r2=1.28.8.5.4.2ty=u
Index: php-src/ext/pspell/pspell.c
diff -u php-src/ext/pspell/pspell.c:1.28.8.5.4.1
php-src/ext/pspell/pspell.c:1.28.8.5.4.2
--- php-src/ext/pspell/pspell.c:1.28.8.5.4.1Mon Sep 12 12:59:56 2005
+++ php-src/ext/pspell/pspell.c Mon Oct 17 11:43:10 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: pspell.c,v 1.28.8.5.4.1 2005/09/12 16:59:56 iliaa Exp $ */
+/* $Id: pspell.c,v 1.28.8.5.4.2 2005/10/17 15:43:10 iliaa Exp $ */
#define IS_EXT_MODULE
@@ -99,6 +99,22 @@
delete_pspell_config(config);
}
+#define PSPELL_FETCH_CONFIG \
+ convert_to_long_ex(conf); \
+ config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), type);
\
+ if (config == NULL || type != le_pspell_config) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL config index, Z_LVAL_PP(conf)); \
+ RETURN_FALSE; \
+ } \
+
+#define PSPELL_FETCH_MANAGER \
+ convert_to_long_ex(scin); \
+ manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
\
+ if (!manager || type != le_pspell) {\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, %ld is not a
PSPELL result index, Z_LVAL_PP(scin)); \
+ RETURN_FALSE; \
+ } \
+
/* {{{ PHP_MINIT_FUNCTION
*/
PHP_MINIT_FUNCTION(pspell)
@@ -350,14 +366,8 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(conf);
- config = (PspellConfig *) zend_list_find(Z_LVAL_PP(conf), type);
+ PSPELL_FETCH_CONFIG;
- if (config == NULL || type != le_pspell_config) {
- php_error(E_WARNING, %ld is not a PSPELL config index,
Z_LVAL_PP(conf));
- RETURN_FALSE;
- }
-
ret = new_pspell_manager(config);
if(pspell_error_number(ret) != 0){
@@ -385,13 +395,9 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error(E_WARNING, %ld is not a PSPELL result
index,Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+
+ PSPELL_FETCH_MANAGER;
if(pspell_manager_check(manager, Z_STRVAL_PP(word))){
RETURN_TRUE;
@@ -417,13 +423,9 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error(E_WARNING, %ld is not a PSPELL result
index,Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+
+ PSPELL_FETCH_MANAGER;
array_init(return_value);
@@ -455,14 +457,10 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(miss);
convert_to_string_ex(corr);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error(E_WARNING, %ld is not a PSPELL result
index,Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+
+ PSPELL_FETCH_MANAGER;
pspell_manager_store_replacement(manager, Z_STRVAL_PP(miss),
Z_STRVAL_PP(corr));
if(pspell_manager_error_number(manager) == 0){
@@ -488,13 +486,9 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error(E_WARNING, %ld is not a PSPELL result
index,Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+
+ PSPELL_FETCH_MANAGER;
/*If the word is empty, we have to return; otherwise we'll segfault!
ouch!*/
if(Z_STRLEN_PP(word) == 0){
@@ -525,13 +519,9 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
convert_to_string_ex(word);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
- php_error(E_WARNING, %ld is not a PSPELL result
index,Z_LVAL_PP(scin));
- RETURN_FALSE;
- }
+
+ PSPELL_FETCH_MANAGER;
/*If the word is empty, we have to return; otherwise we'll segfault!
ouch!*/
if(Z_STRLEN_PP(word) == 0){
@@ -562,12 +552,7 @@
WRONG_PARAM_COUNT;
}
- convert_to_long_ex(scin);
- manager = (PspellManager *) zend_list_find(Z_LVAL_PP(scin), type);
- if(!manager){
-
[PHP-CVS] cvs: php-src /ext/standard string.c
rolland Mon Oct 17 13:07:46 2005 EDT
Modified files:
/php-src/ext/standard string.c
Log:
- Unicode impl of strrpos()
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.495r2=1.496ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.495 php-src/ext/standard/string.c:1.496
--- php-src/ext/standard/string.c:1.495 Sat Oct 15 08:50:20 2005
+++ php-src/ext/standard/string.c Mon Oct 17 13:07:44 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.495 2005/10/15 12:50:20 derick Exp $ */
+/* $Id: string.c,v 1.496 2005/10/17 17:07:44 rolland Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2292,61 +2292,118 @@
Finds position of last occurrence of a string within another string */
PHP_FUNCTION(strrpos)
{
- zval *zneedle;
- char *needle, *haystack;
- int needle_len, haystack_len;
+ zval *zhaystack, *zneedle;
+ void *haystack, *needle;
+ int32_t haystack_len, needle_len = 0;
+ zend_uchar str_type;
long offset = 0;
char *p, *e, ord_needle[2];
+ UChar *pos, *u_p, *u_e, u_ord_needle[3];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz|l, haystack,
haystack_len, zneedle, offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zz|l,
+ zhaystack, zneedle,
offset) == FAILURE) {
RETURN_FALSE;
}
- if (Z_TYPE_P(zneedle) == IS_STRING) {
- needle = Z_STRVAL_P(zneedle);
- needle_len = Z_STRLEN_P(zneedle);
+ if (Z_TYPE_P(zhaystack) != IS_UNICODE Z_TYPE_P(zhaystack) !=
IS_BINARY Z_TYPE_P(zhaystack) != IS_STRING) {
+ convert_to_text(zhaystack);
+ }
+ if (Z_TYPE_P(zneedle) == IS_UNICODE || Z_TYPE_P(zneedle) == IS_BINARY
|| Z_TYPE_P(zneedle) == IS_STRING) {
+ if (Z_TYPE_P(zneedle) != Z_TYPE_P(zhaystack)) {
+ str_type = zend_get_unified_string_type(2 TSRMLS_CC,
Z_TYPE_P(zhaystack), Z_TYPE_P(zneedle));
+ if (str_type == (zend_uchar)-1) {
+ convert_to_explicit_type(zhaystack, IS_BINARY);
+ convert_to_explicit_type(zneedle, IS_BINARY);
+ } else {
+ convert_to_explicit_type(zhaystack, str_type);
+ convert_to_explicit_type(zneedle, str_type);
+ }
+ }
+ needle = Z_UNIVAL_P(zneedle);
+ needle_len = Z_UNILEN_P(zneedle);
} else {
- convert_to_long(zneedle);
- ord_needle[0] = (char)(Z_LVAL_P(zneedle) 0xFF);
- ord_needle[1] = '\0';
- needle = ord_needle;
- needle_len = 1;
+ if (Z_TYPE_P(zhaystack) == IS_UNICODE) {
+ if (Z_LVAL_P(zneedle) 0 || Z_LVAL_P(zneedle)
0x10) {
+ php_error(E_WARNING, Needle argument codepoint
value out of range (0 - 0x10));
+ RETURN_FALSE;
+ }
+ if (U_IS_BMP(Z_LVAL_P(zneedle))) {
+ u_ord_needle[needle_len++] =
(UChar)Z_LVAL_P(zneedle);
+ u_ord_needle[needle_len] = 0;
+ } else {
+ u_ord_needle[needle_len++] =
(UChar)U16_LEAD(Z_LVAL_P(zneedle));
+ u_ord_needle[needle_len++] =
(UChar)U16_TRAIL(Z_LVAL_P(zneedle));
+ u_ord_needle[needle_len] = 0;
+ }
+ needle = u_ord_needle;
+ } else {
+ convert_to_long(zneedle);
+ ord_needle[0] = (char)(Z_LVAL_P(zneedle) 0xFF);
+ ord_needle[1] = '\0';
+ needle = ord_needle;
+ needle_len = 1;
+ }
}
+ haystack = Z_UNIVAL_P(zhaystack);
+ haystack_len = Z_UNILEN_P(zhaystack);
if ((haystack_len == 0) || (needle_len == 0)) {
RETURN_FALSE;
}
- if (offset = 0) {
- p = haystack + offset;
- e = haystack + haystack_len - needle_len;
+ if (Z_TYPE_P(zhaystack) == IS_UNICODE) {
+ if (offset = 0) {
+ u_p = (UChar *)haystack + offset;
+ u_e = (UChar *)haystack + haystack_len - needle_len;
+ } else {
+ u_p = haystack;
+ if (-offset haystack_len) {
+ u_e = (UChar *)haystack - needle_len;
+ } else if (needle_len -offset) {
+
Re: [PHP-CVS] cvs: php-src(PHP_5_1) / NEWS
Well, perhaps we need to mark such changes differently and not include them in the actualy NEWS in the actual release? --Jani On Mon, 17 Oct 2005, Ilia Alshanetsky wrote: When making RCs in the 4.X branch we've always separated RCs and then merged them into a single entry when the final release was made. This allowed quick determination what changes were made between each RC. Ilia Jani Taskinen wrote: sniper Sun Oct 16 13:54:39 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcNEWS Log: NEWS file is about changes between releases. (RCs are not releases..) -- 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_1) /ext/libxml libxml.c
Hey Rob, This looks a bit strange (although it probably works :) Andi At 01:34 PM 10/13/2005, Rob Richards wrote: + context = context = php_libxml_streams_IO_open_write_wrapper(URI); Zend/PHP Conference Expo Power Your Business with PHP October 18-21, 2005 - San Francisco http://zend.kbconferences.com/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /sapi/apache2handler sapi_apache2.c
I don't see a reason why not to also commit critical patches to 5.0.x. I believe we will still have 5.0.6, especially due to the reference fixes, and who knows if we have security problems, we might have more in future. The fact that Jani and you aren't using 5.0 doesn't mean we can't/shouldn't commit critical fixes. Anyway, Antony's question was directed at Rasmus, and you're right, if Rasmus doesn't feel like it, then someone else would have to backport. At 03:46 AM 10/13/2005, Derick Rethans wrote: On Thu, 13 Oct 2005, Antony Dovgal wrote: On 13.10.2005 14:14, Jani Taskinen wrote: PHP_5_0 branch is dead as far as most of use are concerned. We're about to release 5.1, not 5.0.x. I know that we're about to release 5.1, but up to that moment I'd like to see all the patches for HEAD MFH'ed to 5.0 too. Feel free to backport them ofcourse... Derick -- Derick Rethans http://derickrethans.nl | http://ez.no | http://xdebug.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php Zend/PHP Conference Expo Power Your Business with PHP October 18-21, 2005 - San Francisco http://zend.kbconferences.com/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_0) /sapi/apache2handler sapi_apache2.c
rasmus Mon Oct 17 15:35:45 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/sapi/apache2handlersapi_apache2.c
Log:
MFH the fix to bug #33690
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.40.2.12r2=1.40.2.13ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.12
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.13
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.12Tue Oct 4
20:44:04 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Mon Oct 17 15:35:39 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.12 2005/10/05 00:44:04 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.13 2005/10/17 19:35:39 rasmus Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -452,6 +452,23 @@
} \
conf = ap_get_module_config(r-per_dir_config, php5_module);
+
+ /* apply_config() needs r in some cases, so allocate server_context
early */
+ ctx = SG(server_context);
+ if (ctx == NULL) {
+normal:
+ ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
+ /* register a cleanup so we clear out the SG(server_context)
+* after each request. Note: We pass in the pointer to the
+* server_context in case this is handled by a different thread.
+*/
+ apr_pool_cleanup_register(r-pool, (void *)SG(server_context),
php_server_context_cleanup, apr_pool_cleanup_null);
+ ctx-r = r;
+ ctx = NULL; /* May look weird to null it here, but it is to
catch the right case in the first_try later on */
+ } else {
+ parent_req = ctx-r;
+ ctx-r = r;
+ }
apply_config(conf);
if (strcmp(r-handler, PHP_MAGIC_TYPE) strcmp(r-handler,
PHP_SOURCE_MAGIC_TYPE) strcmp(r-handler, PHP_SCRIPT)) {
@@ -499,25 +516,24 @@
zend_first_try {
- ctx = SG(server_context);
if (ctx == NULL) {
-normal:
- ctx = SG(server_context) = apr_pcalloc(r-pool, sizeof(*ctx));
- /* register a cleanup so we clear out the SG(server_context)
-* after each request. Note: We pass in the pointer to the
-* server_context in case this is handled by a different thread.
-*/
- apr_pool_cleanup_register(r-pool, (void *)SG(server_context),
php_server_context_cleanup, apr_pool_cleanup_null);
-
- ctx-r = r;
brigade = apr_brigade_create(r-pool,
r-connection-bucket_alloc);
+ ctx = SG(server_context);
ctx-brigade = brigade;
if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS) {
zend_bailout();
}
} else {
- parent_req = ctx-r;
+ if (!parent_req) {
+ parent_req = ctx-r;
+ }
+ if (parent_req strcmp(parent_req-handler, PHP_MAGIC_TYPE)
strcmp(parent_req-handler, PHP_SOURCE_MAGIC_TYPE)
strcmp(parent_req-handler, PHP_SCRIPT)) {
+ if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS)
{
+ zend_bailout();
+ }
+ }
+
/* check if comming due to ErrorDocument */
if (parent_req parent_req-status != HTTP_OK) {
parent_req = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /sapi/apache2handler sapi_apache2.c
Andi Gutmans wrote: I don't see a reason why not to also commit critical patches to 5.0.x. I believe we will still have 5.0.6, especially due to the reference fixes, and who knows if we have security problems, we might have more in future. The fact that Jani and you aren't using 5.0 doesn't mean we can't/shouldn't commit critical fixes. Anyway, Antony's question was directed at Rasmus, and you're right, if Rasmus doesn't feel like it, then someone else would have to backport. I have merged in the fix, but someone who is actually running PHP 5.0 with Apache2 may want to verify that it doesn't break everything. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/pspell pspell.c
Thanks for fixing that out. Now it is correct! My test case was obviously not using the api correctly. Nuno - Original Message - From: Ilia Alshanetsky [EMAIL PROTECTED] To: php-cvs@lists.php.net Sent: Monday, October 17, 2005 4:29 PM Subject: [PHP-CVS] cvs: php-src /ext/pspell pspell.c iliaa Mon Oct 17 11:29:56 2005 EDT Modified files: /php-src/ext/pspell pspell.c Log: Properly fixed bug #34456 (original patch completely reverted). -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/libxml libxml.c
rrichards Mon Oct 17 15:47:35 2005 EDT
Modified files:
/php-src/ext/libxml libxml.c
Log:
only need context set once
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.37r2=1.38ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.37 php-src/ext/libxml/libxml.c:1.38
--- php-src/ext/libxml/libxml.c:1.37Thu Oct 13 16:17:18 2005
+++ php-src/ext/libxml/libxml.c Mon Oct 17 15:47:23 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.37 2005/10/13 20:17:18 rrichards Exp $ */
+/* $Id: libxml.c,v 1.38 2005/10/17 19:47:23 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -386,7 +386,7 @@
/* try with a non-escaped URI this may be a strange filename */
if (context == NULL) {
- context = context =
php_libxml_streams_IO_open_write_wrapper(URI);
+ context = php_libxml_streams_IO_open_write_wrapper(URI);
}
if (context == NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c
rolland Mon Oct 17 15:50:19 2005 EDT
Modified files:
/php-src/ext/standard string.c
Log:
- Unicode impl of stripos()
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.496r2=1.497ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.496 php-src/ext/standard/string.c:1.497
--- php-src/ext/standard/string.c:1.496 Mon Oct 17 13:07:44 2005
+++ php-src/ext/standard/string.c Mon Oct 17 15:50:13 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.496 2005/10/17 17:07:44 rolland Exp $ */
+/* $Id: string.c,v 1.497 2005/10/17 19:50:13 rolland Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -2228,51 +2228,109 @@
Finds position of first occurrence of a string within another, case
insensitive */
PHP_FUNCTION(stripos)
{
- char *found = NULL;
- char *haystack;
- int haystack_len;
+ zval *haystack, *needle;
long offset = 0;
- char *needle_dup = NULL, *haystack_dup;
+ int32_t haystack_len, needle_len = 0;
+ zend_uchar str_type;
+ void *haystack_dup, *needle_dup = NULL;
char needle_char[2];
- zval *needle;
+ char c;
+ UChar u_needle_char[3];
+ UChar32 ch;
+ void *found = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, sz|l, haystack,
haystack_len, needle, offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, zz|l, haystack,
needle, offset) == FAILURE) {
return;
}
- if (offset 0 || offset haystack_len) {
+ if (Z_TYPE_P(haystack) != IS_UNICODE Z_TYPE_P(haystack) != IS_BINARY
Z_TYPE_P(haystack) != IS_STRING) {
+ convert_to_text(haystack);
+ }
+ if (offset 0 || offset Z_UNILEN_P(haystack)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Offset not
contained in string.);
RETURN_FALSE;
}
- haystack_dup = estrndup(haystack, haystack_len);
- php_strtolower(haystack_dup, haystack_len);
-
- if (Z_TYPE_P(needle) == IS_STRING) {
- needle_dup = estrndup(Z_STRVAL_P(needle), Z_STRLEN_P(needle));
- php_strtolower(needle_dup, Z_STRLEN_P(needle));
- found = php_memnstr(haystack_dup + offset, needle_dup,
Z_STRLEN_P(needle), haystack_dup + haystack_len);
+ if (Z_TYPE_P(needle) == IS_UNICODE || Z_TYPE_P(needle) == IS_BINARY ||
Z_TYPE_P(needle) == IS_STRING) {
+ if (!Z_UNILEN_P(needle)) {
+ RETURN_FALSE;
+ }
+ if (Z_TYPE_P(haystack) != Z_TYPE_P(needle)) {
+ str_type = zend_get_unified_string_type(2 TSRMLS_CC,
Z_TYPE_P(haystack), Z_TYPE_P(needle));
+ if (str_type == (zend_uchar)-1) {
+ convert_to_explicit_type(haystack, IS_BINARY);
+ convert_to_explicit_type(needle, IS_BINARY);
+ } else {
+ convert_to_explicit_type(haystack, str_type);
+ convert_to_explicit_type(needle, str_type);
+ }
+ }
+ haystack_len = Z_UNILEN_P(haystack);
+ needle_len = Z_UNILEN_P(needle);
+ if (Z_TYPE_P(haystack) == IS_UNICODE) {
+ haystack_dup = eustrndup(Z_USTRVAL_P(haystack),
haystack_len);
+ php_u_strtolower((UChar **)haystack_dup,
haystack_len, UG(default_locale));
+ needle_dup = eustrndup(Z_STRVAL_P(needle), needle_len);
+ php_u_strtolower((UChar **)needle_dup, needle_len,
UG(default_locale));
+ found = zend_u_memnstr((UChar *)haystack_dup + offset,
+ (UChar
*)needle_dup, needle_len,
+ (UChar
*)haystack_dup + haystack_len);
+ } else {
+ haystack_dup = estrndup(Z_STRVAL_P(haystack),
haystack_len);
+ php_strtolower((char *)haystack_dup, haystack_len);
+ needle_dup = estrndup(Z_STRVAL_P(needle), needle_len);
+ php_strtolower((char *)needle_dup, Z_STRLEN_P(needle));
+ found = php_memnstr((char *)haystack_dup + offset,
+ (char
*)needle_dup, needle_len,
+ (char
*)haystack_dup + haystack_len);
+ }
} else {
switch (Z_TYPE_P(needle)) {
case IS_LONG:
case IS_BOOL:
- needle_char[0] = tolower((char)
Z_LVAL_P(needle));
+
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/libxml libxml.c
rrichards Mon Oct 17 15:50:20 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/libxml libxml.c
Log:
MFH: only need context set once
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.32.2.3r2=1.32.2.4ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.32.2.3
php-src/ext/libxml/libxml.c:1.32.2.4
--- php-src/ext/libxml/libxml.c:1.32.2.3Thu Oct 13 16:34:37 2005
+++ php-src/ext/libxml/libxml.c Mon Oct 17 15:50:20 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: libxml.c,v 1.32.2.3 2005/10/13 20:34:37 rrichards Exp $ */
+/* $Id: libxml.c,v 1.32.2.4 2005/10/17 19:50:20 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -386,7 +386,7 @@
/* try with a non-escaped URI this may be a strange filename */
if (context == NULL) {
- context = context =
php_libxml_streams_IO_open_write_wrapper(URI);
+ context = php_libxml_streams_IO_open_write_wrapper(URI);
}
if (context == NULL) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / NEWS configure.in /main php_version.h
iliaa Mon Oct 17 16:26:14 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcconfigure.in NEWS /php-src/main php_version.h Log: 5.1.0RC3 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.11r2=1.579.2.12ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.11 php-src/configure.in:1.579.2.12 --- php-src/configure.in:1.579.2.11 Fri Oct 14 11:30:23 2005 +++ php-src/configure.inMon Oct 17 16:26:09 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.11 2005/10/14 15:30:23 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.12 2005/10/17 20:26:09 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION=RC3-dev +EXTRA_VERSION=RC3 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.135r2=1.2027.2.136ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.135 php-src/NEWS:1.2027.2.136 --- php-src/NEWS:1.2027.2.135 Mon Oct 17 11:31:10 2005 +++ php-src/NEWSMon Oct 17 16:26:11 2005 @@ -1,6 +1,8 @@ PHPNEWS ||| -?? Oct 2005, PHP 5.1 Release Candidate 3 +?? Oct 2005, PHP 5.1 Release Candidate 4 + +17 Oct 2005, PHP 5.1 Release Candidate 3 - Fixed bug #34873 (Segmentation Fault on foreach in object). (Dmitry) - Fixed bug #34884 (Possible crash in ext/sqlite when sqlite.assoc_case is being used). (Tony, Ilia) http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.112.2.7r2=1.112.2.8ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.7 php-src/main/php_version.h:1.112.2.8 --- php-src/main/php_version.h:1.112.2.7Fri Oct 14 11:30:26 2005 +++ php-src/main/php_version.h Mon Oct 17 16:26:13 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION RC3-dev -#define PHP_VERSION 5.1.0RC3-dev +#define PHP_EXTRA_VERSION RC3 +#define PHP_VERSION 5.1.0RC3 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) / configure.in /main php_version.h
iliaa Mon Oct 17 18:24:42 2005 EDT Modified files: (Branch: PHP_5_1) /php-srcconfigure.in /php-src/main php_version.h Log: Back to dev http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.12r2=1.579.2.13ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.12 php-src/configure.in:1.579.2.13 --- php-src/configure.in:1.579.2.12 Mon Oct 17 16:26:09 2005 +++ php-src/configure.inMon Oct 17 18:24:41 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.579.2.12 2005/10/17 20:26:09 iliaa Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.579.2.13 2005/10/17 22:24:41 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -42,7 +42,7 @@ MAJOR_VERSION=5 MINOR_VERSION=1 RELEASE_VERSION=0 -EXTRA_VERSION=RC3 +EXTRA_VERSION=RC4-dev VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION dnl Define where extension directories are located in the configure context http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.112.2.8r2=1.112.2.9ty=u Index: php-src/main/php_version.h diff -u php-src/main/php_version.h:1.112.2.8 php-src/main/php_version.h:1.112.2.9 --- php-src/main/php_version.h:1.112.2.8Mon Oct 17 16:26:13 2005 +++ php-src/main/php_version.h Mon Oct 17 18:24:42 2005 @@ -3,5 +3,5 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION RC3 -#define PHP_VERSION 5.1.0RC3 +#define PHP_EXTRA_VERSION RC4-dev +#define PHP_VERSION 5.1.0RC4-dev -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql/tests bug_33689.phpt
iliaa Mon Oct 17 20:06:27 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql/testsbug_33689.phpt
Log:
Fixed test for ZTS builds
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/tests/bug_33689.phpt?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/pdo_mysql/tests/bug_33689.phpt
diff -u php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.1.2.1
php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.1.2.2
--- php-src/ext/pdo_mysql/tests/bug_33689.phpt:1.1.2.1 Thu Aug 11 19:45:22 2005
+++ php-src/ext/pdo_mysql/tests/bug_33689.phpt Mon Oct 17 20:06:20 2005
@@ -3,14 +3,14 @@
--SKIPIF--
?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not
loaded');
-require 'ext/pdo_mysql/tests/config.inc';
-require 'ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/config.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?
--FILE--
?php
-require 'ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory('ext/pdo_mysql/tests/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$db-exec('CREATE TABLE test (bar INT NOT NULL)');
$db-exec('INSERT INTO test VALUES(1)');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_mysql/tests pecl_bug_5200.phpt show_tables.phpt
iliaa Mon Oct 17 20:12:37 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_mysql/testspecl_bug_5200.phpt show_tables.phpt
Log:
Fixed tests for ZTS builds
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt
diff -u php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt:1.1.2.2
php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt:1.1.2.3
--- php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt:1.1.2.2 Mon Sep 19
20:35:21 2005
+++ php-src/ext/pdo_mysql/tests/pecl_bug_5200.phpt Mon Oct 17 20:12:30 2005
@@ -3,14 +3,14 @@
--SKIPIF--
?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not
loaded');
-require 'ext/pdo_mysql/tests/config.inc';
-require 'ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/config.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?
--FILE--
?php
-require 'ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory('ext/pdo_mysql/tests/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__). '/common.phpt');
$db-exec(CREATE TABLE test (bar INT NOT NULL, phase enum('please_select',
'I', 'II', 'IIa', 'IIb', 'III', 'IV')));
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/tests/show_tables.phpt?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/pdo_mysql/tests/show_tables.phpt
diff -u php-src/ext/pdo_mysql/tests/show_tables.phpt:1.1.2.1
php-src/ext/pdo_mysql/tests/show_tables.phpt:1.1.2.2
--- php-src/ext/pdo_mysql/tests/show_tables.phpt:1.1.2.1Thu Aug 11
19:45:22 2005
+++ php-src/ext/pdo_mysql/tests/show_tables.phptMon Oct 17 20:12:30 2005
@@ -3,14 +3,14 @@
--SKIPIF--
?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) die('skip not
loaded');
-require 'ext/pdo_mysql/tests/config.inc';
-require 'ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/config.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?
--FILE--
?php
-require 'ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory('ext/pdo_mysql/tests/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
print_r($db-query('SHOW TABLES'));
--EXPECT--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_pgsql/tests bug_33876.phpt
iliaa Mon Oct 17 20:15:03 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_pgsql/testsbug_33876.phpt
Log:
Fixed test for ZTS builds
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/tests/bug_33876.phpt?r1=1.1.2.3r2=1.1.2.4ty=u
Index: php-src/ext/pdo_pgsql/tests/bug_33876.phpt
diff -u php-src/ext/pdo_pgsql/tests/bug_33876.phpt:1.1.2.3
php-src/ext/pdo_pgsql/tests/bug_33876.phpt:1.1.2.4
--- php-src/ext/pdo_pgsql/tests/bug_33876.phpt:1.1.2.3 Thu Sep 22 12:24:51 2005
+++ php-src/ext/pdo_pgsql/tests/bug_33876.phpt Mon Oct 17 20:15:02 2005
@@ -3,13 +3,13 @@
--SKIPIF--
?php
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not
loaded');
-require 'ext/pdo/tests/pdo_test.inc';
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
PDOTest::skip();
?
--FILE--
?php
-require 'ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory('ext/pdo_pgsql/tests/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$db-setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
$db-exec('CREATE TABLE test (foo varchar(5) NOT NULL, bar bool NOT NULL)');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_sqlite/tests bug33841.phpt
iliaa Mon Oct 17 20:17:27 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_sqlite/tests bug33841.phpt
Log:
ZTS test fix
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/tests/bug33841.phpt?r1=1.1r2=1.1.2.1ty=u
Index: php-src/ext/pdo_sqlite/tests/bug33841.phpt
diff -u php-src/ext/pdo_sqlite/tests/bug33841.phpt:1.1
php-src/ext/pdo_sqlite/tests/bug33841.phpt:1.1.2.1
--- php-src/ext/pdo_sqlite/tests/bug33841.phpt:1.1 Sun Jul 24 13:19:59 2005
+++ php-src/ext/pdo_sqlite/tests/bug33841.phpt Mon Oct 17 20:17:27 2005
@@ -6,8 +6,8 @@
?
--FILE--
?php
-require 'ext/pdo/tests/pdo_test.inc';
-$db = PDOTest::test_factory('ext/pdo_sqlite/tests/common.phpt');
+require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
$db-exec('CREATE TABLE test (text)');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/sysvmsg/tests 001.phpt
iliaa Mon Oct 17 20:20:53 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/sysvmsg/tests 001.phpt Log: ZTS fixes http://cvs.php.net/diff.php/php-src/ext/sysvmsg/tests/001.phpt?r1=1.4r2=1.4.4.1ty=u Index: php-src/ext/sysvmsg/tests/001.phpt diff -u php-src/ext/sysvmsg/tests/001.phpt:1.4 php-src/ext/sysvmsg/tests/001.phpt:1.4.4.1 --- php-src/ext/sysvmsg/tests/001.phpt:1.4 Wed May 19 04:45:23 2004 +++ php-src/ext/sysvmsg/tests/001.phpt Mon Oct 17 20:20:52 2005 @@ -5,7 +5,7 @@ if (!extension_loaded(sysvmsg)) print skip; ? --FILE-- ?php -$key = ftok(./ext/sysvmsg/tests/001.phpt, p); +$key = ftok(dirname(__FILE__) . /001.phpt, p); $q = msg_get_queue($key); msg_send($q, 1, hello) or print FAIL\n; $type = null; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/pdo_odbc pdo_odbc.c
dbs Mon Oct 17 21:01:34 2005 EDT Modified files: /php-src/ext/pdo_odbc pdo_odbc.c Log: Apply patch for #34900, sight unseen. http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/pdo_odbc.c?r1=1.15r2=1.16ty=u Index: php-src/ext/pdo_odbc/pdo_odbc.c diff -u php-src/ext/pdo_odbc/pdo_odbc.c:1.15 php-src/ext/pdo_odbc/pdo_odbc.c:1.16 --- php-src/ext/pdo_odbc/pdo_odbc.c:1.15Mon Sep 19 20:45:16 2005 +++ php-src/ext/pdo_odbc/pdo_odbc.c Mon Oct 17 21:01:32 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pdo_odbc.c,v 1.15 2005/09/20 00:45:16 wez Exp $ */ +/* $Id: pdo_odbc.c,v 1.16 2005/10/18 01:01:32 dbs Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -112,10 +112,10 @@ } #endif - REGISTER_PDO_CONST_LONG(ODBC_ATTR_USE_CURSOR_LIBRARY, PDO_ODBC_ATTR_USE_CURSOR_LIBRARY); - REGISTER_PDO_CONST_LONG(ODBC_SQL_USE_IF_NEEDED, SQL_CUR_USE_IF_NEEDED); - REGISTER_PDO_CONST_LONG(ODBC_SQL_USE_DRIVER, SQL_CUR_USE_DRIVER); - REGISTER_PDO_CONST_LONG(ODBC_SQL_USE_ODBC, SQL_CUR_USE_ODBC); + REGISTER_PDO_CLASS_CONST_LONG(ODBC_ATTR_USE_CURSOR_LIBRARY, PDO_ODBC_ATTR_USE_CURSOR_LIBRARY); + REGISTER_PDO_CLASS_CONST_LONG(ODBC_SQL_USE_IF_NEEDED, SQL_CUR_USE_IF_NEEDED); + REGISTER_PDO_CLASS_CONST_LONG(ODBC_SQL_USE_DRIVER, SQL_CUR_USE_DRIVER); + REGISTER_PDO_CLASS_CONST_LONG(ODBC_SQL_USE_ODBC, SQL_CUR_USE_ODBC); return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /ext/pdo_odbc pdo_odbc.c
dbs Mon Oct 17 21:05:22 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/pdo_odbc pdo_odbc.c Log: Apply patch for #34900, sight unseen. http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/pdo_odbc.c?r1=1.14.2.2r2=1.14.2.3ty=u Index: php-src/ext/pdo_odbc/pdo_odbc.c diff -u php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.2 php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.3 --- php-src/ext/pdo_odbc/pdo_odbc.c:1.14.2.2Mon Sep 19 20:46:02 2005 +++ php-src/ext/pdo_odbc/pdo_odbc.c Mon Oct 17 21:05:22 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pdo_odbc.c,v 1.14.2.2 2005/09/20 00:46:02 wez Exp $ */ +/* $Id: pdo_odbc.c,v 1.14.2.3 2005/10/18 01:05:22 dbs Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -112,10 +112,10 @@ } #endif - REGISTER_PDO_CONST_LONG(ODBC_ATTR_USE_CURSOR_LIBRARY, PDO_ODBC_ATTR_USE_CURSOR_LIBRARY); - REGISTER_PDO_CONST_LONG(ODBC_SQL_USE_IF_NEEDED, SQL_CUR_USE_IF_NEEDED); - REGISTER_PDO_CONST_LONG(ODBC_SQL_USE_DRIVER, SQL_CUR_USE_DRIVER); - REGISTER_PDO_CONST_LONG(ODBC_SQL_USE_ODBC, SQL_CUR_USE_ODBC); + REGISTER_PDO_CLASS_CONST_LONG(ODBC_ATTR_USE_CURSOR_LIBRARY, PDO_ODBC_ATTR_USE_CURSOR_LIBRARY); + REGISTER_PDO_CLASS_CONST_LONG(ODBC_SQL_USE_IF_NEEDED, SQL_CUR_USE_IF_NEEDED); + REGISTER_PDO_CLASS_CONST_LONG(ODBC_SQL_USE_DRIVER, SQL_CUR_USE_DRIVER); + REGISTER_PDO_CLASS_CONST_LONG(ODBC_SQL_USE_ODBC, SQL_CUR_USE_ODBC); return SUCCESS; } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
iliaa Mon Oct 17 21:15:39 2005 EDT Modified files: /CVSROOTavail Log: IBM license restriction for pecl/pdo_ids http://cvs.php.net/diff.php/CVSROOT/avail?r1=1.1040r2=1.1041ty=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1040 CVSROOT/avail:1.1041 --- CVSROOT/avail:1.1040Fri Oct 14 06:21:34 2005 +++ CVSROOT/avail Mon Oct 17 21:15:30 2005 @@ -301,13 +301,14 @@ # Curl modules avail|bagder,sterling,crisb,linus_nielsen|curl,curl-cpp,curl-java,curl-perl,curl-php,curl-www -# DB2, SDO and PDO_ODBC have tighter restrictions, so that IBM are not overly +# DB2, SDO, IDS and PDO_ODBC have tighter restrictions, so that IBM are not overly # legally encumbered. If you have contributions for these two extensions, # please contact the lead developers. This is a temporary measure until # we can put in place a more general process. -unavail||pecl/ibm_db2,pecl/pdo_odbc,php-src/ext/pdo_odbc,pecl/sdo +unavail||pecl/ibm_db2,pecl/pdo_odbc,php-src/ext/pdo_odbc,pecl/sdo,pecl/pdo_ids avail|dbs,skoduru|pecl/ibm_db2 avail|wez,dbs|pecl/pdo_odbc,php-src/ext/pdo_odbc avail|gcc,cem,mfp,ansriniv|pecl/sdo +avail|dbs|pecl/pdo_ids # vim:set ft=conf sw=2 ts=2 et: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src / NEWS /sapi/apache2handler sapi_apache2.c
Thanks! Will verify it works. At 12:36 PM 10/17/2005, Rasmus Lerdorf wrote: Andi Gutmans wrote: I don't see a reason why not to also commit critical patches to 5.0.x. I believe we will still have 5.0.6, especially due to the reference fixes, and who knows if we have security problems, we might have more in future. The fact that Jani and you aren't using 5.0 doesn't mean we can't/shouldn't commit critical fixes. Anyway, Antony's question was directed at Rasmus, and you're right, if Rasmus doesn't feel like it, then someone else would have to backport. I have merged in the fix, but someone who is actually running PHP 5.0 with Apache2 may want to verify that it doesn't break everything. -Rasmus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php Zend/PHP Conference Expo Power Your Business with PHP October 18-21, 2005 - San Francisco http://zend.kbconferences.com/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
