[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Feb 21 20:35:55 2005 EDT Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.1901r2=1.1902ty=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.1901 php-src/ChangeLog:1.1902 --- php-src/ChangeLog:1.1901Sun Feb 20 20:33:52 2005 +++ php-src/ChangeLog Mon Feb 21 20:35:54 2005 @@ -1,3 +1,138 @@ +2005-02-21 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_0) + ext/mysqli/tests/skipif.inc: + Added missing skipif.inc (bug #31940) + +* main/SAPI.c: + Nuke unused variables when PCRE is not compiled in + +* main/SAPI.c: + Remove the useless TSRM_FETCH calls + +2005-02-21 Moriyoshi Koizumi [EMAIL PROTECTED] + +* NEWS + NEWS: + - BFN + +* ext/mbstring/mbstring.c + ext/mbstring/mbstring.c: + - WS fix. + +* ext/mbstring/mb_gpc.c + ext/mbstring/mbstring.c + main/SAPI.c + main/SAPI.h + main/main.c + main/php_content_types.c + main/php_content_types.h: + - Fix bug #28568 (known_post_content_types is not thread safe). + +* ZendEngine2/Makefile.am: + - Add missing entry. + +2005-02-21 Stanislav Malyshev [EMAIL PROTECTED] + +* (PHP_4_3) + Zend/zend_execute.c: + fix overloaded objects via TMP_VAR + +* (PHP_4_3) + main/SAPI.c: + packport fix from PHP5: read post data if they wreen't read + +2005-02-21 Moriyoshi Koizumi [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS + ext/mbstring/php_mbregex.c: + - MFH: fix bug #30868 (evaluated pointer comparison in mbregex causes + compile +failure). + +* ext/mbstring/php_mbregex.c: + - Fix bug #30868 (evaluated pointer comparison in mbregex causes compile +failure). + +* (PHP_4_3) + NEWS: + - MFH: fix bug #30573 (compiler warning due to invalid type cast). + +2005-02-21 Anantha Kesari H Y [EMAIL PROTECTED] + +* TSRM/tsrm_virtual_cwd.h: + NetWare LibC has lstat implementation + +* TSRM/tsrm_config_common.h: + NetWare can make use of autogenerated config header file + +* TSRM/TSRM.c: + NetWare has pthreads implementation + +* TSRM/TSRM.h: + NetWare can use the tsrm_config.h + +* TSRM/tsrm_virtual_cwd.c: + NetWare LibC has a lstat implementation + +* ext/standard/proc_open.c: + In NetWare LibC WTERMSIG is avaliable as WIFTERMSIG + +2005-02-21 Moriyoshi Koizumi [EMAIL PROTECTED] + +* (PHP_5_0) + NEWS: + - MFH: fix bug #29989 (type re_registers redefined in oniguruma.h) + +2005-02-21 Anantha Kesari H Y [EMAIL PROTECTED] + +* ext/standard/pageinfo.c: + NetWare LibC has pwd.h. Removed unwanted extern basic_globals_id + declaration for Netware. + +* ext/standard/pack.c: + NetWare has pwd.h and removed unwanted check on NEW_LIBC while including + param.h + +* ext/standard/link.c: + NetWare LibC has pwd.h + +* ext/standard/filestat.c: + In NetWare statfs f_bavail member is known as f_bfree + +2005-02-21 Moriyoshi Koizumi [EMAIL PROTECTED] + +* ext/mbstring/mbstring.c: + - Fix compiler warnings. + +* (PHP_4_3) + ext/mbstring/tests/bug28220.phpt + ext/mbstring/tests/bug30549.phpt + ext/mbstring/tests/bug31911.phpt: + - MFH: add testcases for bug #28220, #30549 and #31911. + +* (PHP_5_0) + ext/mbstring/tests/bug28220.phpt + ext/mbstring/tests/bug30549.phpt: + - MFH: add testcases for bug #28220 and #30549. + +* ext/mbstring/tests/bug28220.phpt + ext/mbstring/tests/bug30549.phpt: +1.1.4; + - Add testcases for bug #28220 and #30549. + +* (PHP_4_3) + NEWS + ext/mbstring/config.m4: + - Upgrade libmbfl (fixers bug #28220, #30549 and #31911). + +2005-02-21 Greg Beaver [EMAIL PROTECTED] + +* (PHP_5_0) + pear/go-pear-list.php: + upgrade to PEAR 1.3.5 + 2005-02-20 Moriyoshi Koizumi [EMAIL PROTECTED] * (PHP_5_0) @@ -354,7 +489,7 @@ ext/session/mod_mm.h ext/session/mod_user.h ext/session/php_session.h: - - Missing $Id: ChangeLog,v 1.1901 2005/02/21 01:33:52 changelog Exp $ tags + - Missing $Id: ChangeLog,v 1.1902 2005/02/22 01:35:54 changelog Exp $ tags * (PHP_4_3) ext/session/session.c: @@ -835,7 +970,7 @@ * (PHP_4_3) Zend/zend_ini_scanner.l: - Missing $Id: ChangeLog,v 1.1901 2005/02/21 01:33:52 changelog Exp $ tag + ws fix + Missing $Id: ChangeLog,v 1.1902 2005/02/22 01:35:54 changelog Exp $ tag + ws fix * ZendEngine2/zend_ini_scanner.l ZendEngine2/zend_ini_scanner.l: @@ -2309,7 +2444,7 @@ ext/standard/url_scanner_ex.c ext/standard/url_scanner_ex.h ext/standard/url_scanner_ex.re: - Missing $Id: ChangeLog,v 1.1901 2005/02/21 01:33:52 changelog Exp $ tag + Missing $Id: ChangeLog,v 1.1902 2005/02/22 01:35:54 changelog Exp $ tag *
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon Feb 21 20:36:04 2005 EDT Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/diff.php/ZendEngine2/ChangeLog?r1=1.642r2=1.643ty=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.642 ZendEngine2/ChangeLog:1.643 --- ZendEngine2/ChangeLog:1.642 Sun Feb 20 20:33:58 2005 +++ ZendEngine2/ChangeLog Mon Feb 21 20:36:03 2005 @@ -1,3 +1,8 @@ +2005-02-21 Moriyoshi Koizumi [EMAIL PROTECTED] + +* Makefile.am: + - Add missing entry. + 2005-02-20 Dmitry Stogov [EMAIL PROTECTED] * zend_compile.c: @@ -7099,7 +7104,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.642 2005/02/21 01:33:58 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.643 2005/02/22 01:36:03 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -8823,7 +8828,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.642 2005/02/21 01:33:58 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.643 2005/02/22 01:36:03 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_0) /ext/mbstring mbstring.c /ext/mbstring/libmbfl/filters mk_sb_tbl.awk unicode_table_iso8859_10.h unicode_table_iso8859_13.h unicode_table_iso8859_14.h unicode_table_iso8859_15.h unicode_table_iso8859_16.h unicode_table_iso8859_2.h unicode_table_iso8859_3.h unicode_table_iso8859_4.h unicode_table_iso8859_5.h unicode_table_iso8859_6.h unicode_table_iso8859_7.h unicode_table_iso8859_8.h unicode_table_iso8859_9.h
moriyoshi Mon Feb 21 03:01:03 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mbstring mbstring.c
/php-src/ext/mbstring/libmbfl/filters mk_sb_tbl.awk
unicode_table_iso8859_10.h
unicode_table_iso8859_13.h
unicode_table_iso8859_14.h
unicode_table_iso8859_15.h
unicode_table_iso8859_16.h
unicode_table_iso8859_2.h
unicode_table_iso8859_3.h
unicode_table_iso8859_4.h
unicode_table_iso8859_5.h
unicode_table_iso8859_6.h
unicode_table_iso8859_7.h
unicode_table_iso8859_8.h
unicode_table_iso8859_9.h
Log:
- MFH: fix compiler warnings.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.214.2.2r2=1.214.2.3ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.214.2.2
php-src/ext/mbstring/mbstring.c:1.214.2.3
--- php-src/ext/mbstring/mbstring.c:1.214.2.2 Thu Jan 27 20:58:26 2005
+++ php-src/ext/mbstring/mbstring.c Mon Feb 21 03:01:01 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.214.2.2 2005/01/28 01:58:26 tony2001 Exp $ */
+/* $Id: mbstring.c,v 1.214.2.3 2005/02/21 08:01:01 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -134,7 +134,7 @@
};
-php_mb_nls_ident_list php_mb_default_identify_list[] = {
+static const php_mb_nls_ident_list php_mb_default_identify_list[] = {
{ mbfl_no_language_japanese, php_mb_default_identify_list_ja,
sizeof(php_mb_default_identify_list_ja) /
sizeof(php_mb_default_identify_list_ja[0]) },
{ mbfl_no_language_korean, php_mb_default_identify_list_kr,
sizeof(php_mb_default_identify_list_kr) /
sizeof(php_mb_default_identify_list_kr[0]) },
{ mbfl_no_language_traditional_chinese,
php_mb_default_identify_list_tw_hk, sizeof(php_mb_default_identify_list_tw_hk)
/ sizeof(php_mb_default_identify_list_tw_hk[0]) },
@@ -1339,7 +1339,7 @@
PHP_FUNCTION(mb_parse_str)
{
zval *track_vars_array;
- char *encstr = NULL, *separator = NULL;
+ char *encstr = NULL;
int encstr_len;
php_mb_encoding_handler_info_t info;
enum mbfl_no_encoding detected;
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk?r1=1.1.2.1r2=1.1.2.2ty=u
Index: php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk
diff -u php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.2.1
php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.2.2
--- php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.2.1 Sun Feb 20
18:02:50 2005
+++ php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk Mon Feb 21 03:01:03 2005
@@ -1,10 +1,33 @@
#!/usr/bin/awk -f
#
-# $Id: mk_sb_tbl.awk,v 1.1.2.1 2005/02/20 23:02:50 moriyoshi Exp $
+# $Id: mk_sb_tbl.awk,v 1.1.2.2 2005/02/21 08:01:03 moriyoshi Exp $
#
# Description: a script that generates a single byte code set to Unicode
# mapping table.
#
+
+function conv(str) {
+ if (!match(str, ^0[xX])) {
+ return 0 + str
+ }
+
+ retval = 0
+
+ for (i = 3; i = length(str); i++) {
+ n = index(0123456789abcdefABCDEF, substr(str, i, 1)) - 1
+
+ if (n 0) {
+ return 0 + str;
+ } else if (n = 16) {
+ n -= 6;
+ }
+
+ retval = retval * 16 + n
+ }
+
+ return retval
+}
+
BEGIN {
FS=[ \t#]
}
@@ -14,7 +37,7 @@
}
{
- tbl[$1 + 0] = $2
+ tbl[conv($1)] = conv($2)
}
END {
@@ -23,14 +46,14 @@
print #ifndef IFNDEF_NAME
}
- print static const unsigned int TABLE_NAME [] = {
+ print static const int TABLE_NAME [] = {
i = 160;
for (;;) {
printf(\t0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,
0x%04x, 0x%04x, tbl[i++], tbl[i++], tbl[i++], tbl[i++], tbl[i++], tbl[i++],
tbl[i++], tbl[i++]);
if (i != 256) {
printf(,\n);
} else {
- print
+ print
break;
}
}
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h?r1=1.1.4.1r2=1.1.4.2ty=u
Index: php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h
diff -u
[PHP-CVS] cvs: php-src(PHP_4_3) /ext/mbstring mbstring.c /ext/mbstring/libmbfl/filters mk_sb_tbl.awk unicode_table_iso8859_10.h unicode_table_iso8859_13.h unicode_table_iso8859_14.h unicode_table_iso8859_15.h unicode_table_iso8859_16.h unicode_table_iso8859_2.h unicode_table_iso8859_3.h unicode_table_iso8859_4.h unicode_table_iso8859_5.h unicode_table_iso8859_6.h unicode_table_iso8859_7.h unicode_table_iso8859_8.h unicode_table_iso8859_9.h
moriyoshi Mon Feb 21 03:03:49 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/mbstring mbstring.c
/php-src/ext/mbstring/libmbfl/filters mk_sb_tbl.awk
unicode_table_iso8859_10.h
unicode_table_iso8859_13.h
unicode_table_iso8859_14.h
unicode_table_iso8859_15.h
unicode_table_iso8859_16.h
unicode_table_iso8859_2.h
unicode_table_iso8859_3.h
unicode_table_iso8859_4.h
unicode_table_iso8859_5.h
unicode_table_iso8859_6.h
unicode_table_iso8859_7.h
unicode_table_iso8859_8.h
unicode_table_iso8859_9.h
Log:
- MFH: fix compiler warnings.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.142.2.46r2=1.142.2.47ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.46
php-src/ext/mbstring/mbstring.c:1.142.2.47
--- php-src/ext/mbstring/mbstring.c:1.142.2.46 Sun Jan 16 10:56:05 2005
+++ php-src/ext/mbstring/mbstring.c Mon Feb 21 03:03:47 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.142.2.46 2005/01/16 15:56:05 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47 2005/02/21 08:03:47 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module mbstring
@@ -147,7 +147,7 @@
};
-php_mb_nls_ident_list php_mb_default_identify_list[] = {
+static const php_mb_nls_ident_list php_mb_default_identify_list[] = {
{ mbfl_no_language_japanese, php_mb_default_identify_list_ja,
sizeof(php_mb_default_identify_list_ja) /
sizeof(php_mb_default_identify_list_ja[0]) },
{ mbfl_no_language_korean, php_mb_default_identify_list_kr,
sizeof(php_mb_default_identify_list_kr) /
sizeof(php_mb_default_identify_list_kr[0]) },
{ mbfl_no_language_traditional_chinese,
php_mb_default_identify_list_tw_hk, sizeof(php_mb_default_identify_list_tw_hk)
/ sizeof(php_mb_default_identify_list_tw_hk[0]) },
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk?r1=1.1.4.1r2=1.1.4.2ty=u
Index: php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk
diff -u php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.4.1
php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.4.2
--- php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk:1.1.4.1 Mon Feb 21
02:10:13 2005
+++ php-src/ext/mbstring/libmbfl/filters/mk_sb_tbl.awk Mon Feb 21 03:03:48 2005
@@ -1,6 +1,6 @@
#!/usr/bin/awk -f
#
-# $Id: mk_sb_tbl.awk,v 1.1.4.1 2005/02/21 07:10:13 moriyoshi Exp $
+# $Id: mk_sb_tbl.awk,v 1.1.4.2 2005/02/21 08:03:48 moriyoshi Exp $
#
# Description: a script that generates a single byte code set to Unicode
# mapping table.
@@ -46,7 +46,7 @@
print #ifndef IFNDEF_NAME
}
- print static const unsigned int TABLE_NAME [] = {
+ print static const int TABLE_NAME [] = {
i = 160;
for (;;) {
printf(\t0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,
0x%04x, 0x%04x, tbl[i++], tbl[i++], tbl[i++], tbl[i++], tbl[i++], tbl[i++],
tbl[i++], tbl[i++]);
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h
diff -u php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h:1.1.2.2
php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h:1.1.2.3
--- php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h:1.1.2.2
Mon Feb 21 02:10:13 2005
+++ php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h Mon Feb
21 03:03:48 2005
@@ -1,6 +1,6 @@
/* This file is automatically generated. Do not edit! */
#ifndef UNICODE_TABLE_ISO8859_10_H
-static const unsigned int iso8859_10_ucs_table[] = {
+static const int iso8859_10_ucs_table[] = {
0x00a0, 0x0104, 0x0112, 0x0122, 0x012a, 0x0128, 0x0136, 0x00a7,
0x013b, 0x0110, 0x0160, 0x0166, 0x017d, 0x00ad, 0x016a, 0x014a,
0x00b0, 0x0105, 0x0113, 0x0123, 0x012b, 0x0129, 0x0137, 0x00b7,
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h?r1=1.1.2.2r2=1.1.2.3ty=u
Index: php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h
diff -u php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h:1.1.2.2
php-src/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h:1.1.2.3
---
[PHP-CVS] cvs: php-src /ext/standard filestat.c
hyanantha Mon Feb 21 04:08:54 2005 EDT Modified files: /php-src/ext/standard filestat.c Log: In NetWare statfs f_bavail member is known as f_bfree http://cvs.php.net/diff.php/php-src/ext/standard/filestat.c?r1=1.134r2=1.135ty=u Index: php-src/ext/standard/filestat.c diff -u php-src/ext/standard/filestat.c:1.134 php-src/ext/standard/filestat.c:1.135 --- php-src/ext/standard/filestat.c:1.134 Thu Feb 17 08:57:21 2005 +++ php-src/ext/standard/filestat.c Mon Feb 21 04:08:54 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: filestat.c,v 1.134 2005/02/17 13:57:21 hyanantha Exp $ */ +/* $Id: filestat.c,v 1.135 2005/02/21 09:08:54 hyanantha Exp $ */ #include php.h #include safe_mode.h @@ -311,8 +311,12 @@ } #elif (defined(HAVE_SYS_STATFS_H) || defined(HAVE_SYS_MOUNT_H)) defined(HAVE_STATFS) if (statfs(Z_STRVAL_PP(path), buf)) RETURN_FALSE; +#ifdef NETWARE + bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bfree)); +#else bytesfree = (((double)buf.f_bsize) * ((double)buf.f_bavail)); #endif +#endif #endif /* WINDOWS */ RETURN_DOUBLE(bytesfree); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard link.c
hyanantha Mon Feb 21 04:12:44 2005 EDT Modified files: /php-src/ext/standard link.c Log: NetWare LibC has pwd.h http://cvs.php.net/diff.php/php-src/ext/standard/link.c?r1=1.50r2=1.51ty=u Index: php-src/ext/standard/link.c diff -u php-src/ext/standard/link.c:1.50 php-src/ext/standard/link.c:1.51 --- php-src/ext/standard/link.c:1.50Mon Nov 1 19:37:32 2004 +++ php-src/ext/standard/link.c Mon Feb 21 04:12:44 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: link.c,v 1.50 2004/11/02 00:37:32 iliaa Exp $ */ +/* $Id: link.c,v 1.51 2005/02/21 09:12:44 hyanantha Exp $ */ #include php.h #include php_filestat.h @@ -33,8 +33,6 @@ #if HAVE_PWD_H #ifdef PHP_WIN32 #include win32/pwd.h -#elif defined(NETWARE) -#include netware/pwd.h #else #include pwd.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard pack.c
hyanantha Mon Feb 21 04:17:30 2005 EDT Modified files: /php-src/ext/standard pack.c Log: NetWare has pwd.h and removed unwanted check on NEW_LIBC while including param.h http://cvs.php.net/diff.php/php-src/ext/standard/pack.c?r1=1.55r2=1.56ty=u Index: php-src/ext/standard/pack.c diff -u php-src/ext/standard/pack.c:1.55 php-src/ext/standard/pack.c:1.56 --- php-src/ext/standard/pack.c:1.55Tue Jan 25 17:50:39 2005 +++ php-src/ext/standard/pack.c Mon Feb 21 04:17:30 2005 @@ -15,7 +15,7 @@ | Author: Chris Schneider [EMAIL PROTECTED] | +--+ */ -/* $Id: pack.c,v 1.55 2005/01/25 22:50:39 iliaa Exp $ */ +/* $Id: pack.c,v 1.56 2005/02/21 09:17:30 hyanantha Exp $ */ #include php.h @@ -34,12 +34,8 @@ #else #include sys/socket.h #endif -#ifdef NEW_LIBC #include sys/param.h #else -#include netware/param.h -#endif -#else #include sys/param.h #endif #include ext/standard/head.h @@ -49,8 +45,6 @@ #if HAVE_PWD_H #ifdef PHP_WIN32 #include win32/pwd.h -#elif defined(NETWARE) -#include netware/pwd.h #else #include pwd.h #endif -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/oniguruma php_onig_compat.h
moriyoshi Mon Feb 21 04:43:56 2005 EDT Modified files: /php-src/ext/mbstring/oniguruma php_onig_compat.h Log: - Fix bug #29989 (type re_registers redefined in oniguruma.h) http://cvs.php.net/diff.php/php-src/ext/mbstring/oniguruma/php_onig_compat.h?r1=1.1r2=1.2ty=u Index: php-src/ext/mbstring/oniguruma/php_onig_compat.h diff -u php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.1 php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.2 --- php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.1Mon Jul 19 01:04:33 2004 +++ php-src/ext/mbstring/oniguruma/php_onig_compat.hMon Feb 21 04:43:55 2005 @@ -3,5 +3,6 @@ #define re_pattern_buffer php_mb_re_pattern_buffer #define regex_t php_mb_regex_t +#define re_registersphp_mb_re_registers #endif /* _PHP_MBREGEX_COMPAT_H */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard pageinfo.c
hyanantha Mon Feb 21 04:44:58 2005 EDT Modified files: /php-src/ext/standard pageinfo.c Log: NetWare LibC has pwd.h. Removed unwanted extern basic_globals_id declaration for Netware. http://cvs.php.net/diff.php/php-src/ext/standard/pageinfo.c?r1=1.38r2=1.39ty=u Index: php-src/ext/standard/pageinfo.c diff -u php-src/ext/standard/pageinfo.c:1.38 php-src/ext/standard/pageinfo.c:1.39 --- php-src/ext/standard/pageinfo.c:1.38Sat Sep 25 11:23:35 2004 +++ php-src/ext/standard/pageinfo.c Mon Feb 21 04:44:58 2005 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: pageinfo.c,v 1.38 2004/09/25 15:23:35 hyanantha Exp $ */ +/* $Id: pageinfo.c,v 1.39 2005/02/21 09:44:58 hyanantha Exp $ */ #include php.h #include pageinfo.h @@ -27,11 +27,6 @@ #if HAVE_PWD_H #ifdef PHP_WIN32 #include win32/pwd.h -#elif defined(NETWARE) -#ifdef ZTS -extern int basic_globals_id; -#endif -#include netware/pwd.h #else #include pwd.h #endif -- 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) / NEWS /ext/mbstring/oniguruma php_onig_compat.h
moriyoshi Mon Feb 21 04:45:19 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS /php-src/ext/mbstring/oniguruma php_onig_compat.h Log: - MFH: fix bug #29989 (type re_registers redefined in oniguruma.h) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.252r2=1.1760.2.253ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.252 php-src/NEWS:1.1760.2.253 --- php-src/NEWS:1.1760.2.252 Sun Feb 20 18:14:24 2005 +++ php-src/NEWSMon Feb 21 04:45:18 2005 @@ -109,6 +109,7 @@ in segfault). (pdan-php at esync dot org, Tony) - Fixed bug #30120 (imagettftext() and imagettfbbox() accept too many parameters). (Jani) +- Fixed bug #29989 (type re_registers redefined in oniguruma.h). (Moriyoshi) - Fixed bug #29767 (Weird behaviour of __set($name, $value)). (Dmitry) - Fixed bug #29733 (printf() handles repeated placeholders wrong). (bugs dot php dot net at bluetwanger dot de, Ilia) http://cvs.php.net/diff.php/php-src/ext/mbstring/oniguruma/php_onig_compat.h?r1=1.1.2.1r2=1.1.2.2ty=u Index: php-src/ext/mbstring/oniguruma/php_onig_compat.h diff -u php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.1.2.1 php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.1.2.2 --- php-src/ext/mbstring/oniguruma/php_onig_compat.h:1.1.2.1Mon Jul 19 01:06:01 2004 +++ php-src/ext/mbstring/oniguruma/php_onig_compat.hMon Feb 21 04:45:19 2005 @@ -3,5 +3,6 @@ #define re_pattern_buffer php_mb_re_pattern_buffer #define regex_t php_mb_regex_t +#define re_registersphp_mb_re_registers #endif /* _PHP_MBREGEX_COMPAT_H */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard proc_open.c
hyanantha Mon Feb 21 04:50:48 2005 EDT
Modified files:
/php-src/ext/standard proc_open.c
Log:
In NetWare LibC WTERMSIG is avaliable as WIFTERMSIG
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.30r2=1.31ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.30
php-src/ext/standard/proc_open.c:1.31
--- php-src/ext/standard/proc_open.c:1.30 Wed Nov 10 14:47:15 2004
+++ php-src/ext/standard/proc_open.cMon Feb 21 04:50:48 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong [EMAIL PROTECTED] |
+--+
*/
-/* $Id: proc_open.c,v 1.30 2004/11/10 19:47:15 wez Exp $ */
+/* $Id: proc_open.c,v 1.31 2005/02/21 09:50:48 hyanantha Exp $ */
#if 0 (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -403,7 +403,11 @@
}
if (WIFSIGNALED(wstatus)) {
signaled = 1;
+#ifdef NETWARE
+ termsig = WIFTERMSIG(wstatus);
+#else
termsig = WTERMSIG(wstatus);
+#endif
}
if (WIFSTOPPED(wstatus)) {
stopped = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring/libmbfl/filters mbfilter_htmlent.c /ext/mbstring/libmbfl/mbfl mbfl_convert.h
moriyoshi Mon Feb 21 05:12:43 2005 EDT
Modified files:
/php-src/ext/mbstring/libmbfl/filters mbfilter_htmlent.c
/php-src/ext/mbstring/libmbfl/mbfl mbfl_convert.h
Log:
- Fix bug #30573 (compiler warning due to invalid type cast)
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c?r1=1.6r2=1.7ty=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.6
php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.7
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.6 Mon Jan 10
06:26:56 2005
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c Mon Feb 21
05:12:43 2005
@@ -145,7 +145,7 @@
int mbfl_filt_conv_html_enc_flush(mbfl_convert_filter *filter)
{
filter-status = 0;
- filter-cache = 0;
+ filter-opaque = NULL;
return 0;
}
@@ -158,24 +158,24 @@
void mbfl_filt_conv_html_dec_ctor(mbfl_convert_filter *filter)
{
filter-status = 0;
- filter-cache = (int)mbfl_malloc(html_enc_buffer_size+1);
+ filter-opaque = mbfl_malloc(html_enc_buffer_size+1);
}
void mbfl_filt_conv_html_dec_dtor(mbfl_convert_filter *filter)
{
filter-status = 0;
- if (filter-cache)
+ if (filter-opaque)
{
- mbfl_free((void*)filter-cache);
+ mbfl_free((void*)filter-opaque);
}
- filter-cache = 0;
+ filter-opaque = NULL;
}
int mbfl_filt_conv_html_dec(int c, mbfl_convert_filter *filter)
{
int pos, ent = 0;
mbfl_html_entity_entry *entity;
- char *buffer = (char*)filter-cache;
+ char *buffer = (char*)filter-opaque;
if (!filter-status) {
if (c == '' ) {
@@ -246,7 +246,7 @@
int status, pos = 0;
char *buffer;
- buffer = (char*)filter-cache;
+ buffer = (char*)filter-opaque;
status = filter-status;
/* flush fragments */
while (status--) {
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h?r1=1.3r2=1.4ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.3
php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.4
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.3Wed Feb 4
02:24:07 2004
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.hMon Feb 21 05:12:43 2005
@@ -51,6 +51,7 @@
const mbfl_encoding *to;
int illegal_mode;
int illegal_substchar;
+ void *opaque;
};
struct mbfl_convert_vtbl {
--
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) /ext/mbstring/libmbfl/filters mbfilter_htmlent.c /ext/mbstring/libmbfl/mbfl mbfl_convert.h
moriyoshi Mon Feb 21 05:13:22 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mbstring/libmbfl/filters mbfilter_htmlent.c
/php-src/ext/mbstring/libmbfl/mbfl mbfl_convert.h
Log:
- MFH: fix bug #30573 (compiler warning due to invalid type cast).
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c?r1=1.5.2.1r2=1.5.2.2ty=u
Index: php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c
diff -u php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5.2.1
php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5.2.2
--- php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c:1.5.2.1 Mon Jan
10 06:30:01 2005
+++ php-src/ext/mbstring/libmbfl/filters/mbfilter_htmlent.c Mon Feb 21
05:13:22 2005
@@ -145,7 +145,7 @@
int mbfl_filt_conv_html_enc_flush(mbfl_convert_filter *filter)
{
filter-status = 0;
- filter-cache = 0;
+ filter-opaque = NULL;
return 0;
}
@@ -158,24 +158,24 @@
void mbfl_filt_conv_html_dec_ctor(mbfl_convert_filter *filter)
{
filter-status = 0;
- filter-cache = (int)mbfl_malloc(html_enc_buffer_size+1);
+ filter-opaque = mbfl_malloc(html_enc_buffer_size+1);
}
void mbfl_filt_conv_html_dec_dtor(mbfl_convert_filter *filter)
{
filter-status = 0;
- if (filter-cache)
+ if (filter-opaque)
{
- mbfl_free((void*)filter-cache);
+ mbfl_free((void*)filter-opaque);
}
- filter-cache = 0;
+ filter-opaque = NULL;
}
int mbfl_filt_conv_html_dec(int c, mbfl_convert_filter *filter)
{
int pos, ent = 0;
mbfl_html_entity_entry *entity;
- char *buffer = (char*)filter-cache;
+ char *buffer = (char*)filter-opaque;
if (!filter-status) {
if (c == '' ) {
@@ -246,7 +246,7 @@
int status, pos = 0;
char *buffer;
- buffer = (char*)filter-cache;
+ buffer = (char*)filter-opaque;
status = filter-status;
/* flush fragments */
while (status--) {
http://cvs.php.net/diff.php/php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h?r1=1.3r2=1.3.2.1ty=u
Index: php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
diff -u php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.3
php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.3.2.1
--- php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.h:1.3Wed Feb 4
02:24:07 2004
+++ php-src/ext/mbstring/libmbfl/mbfl/mbfl_convert.hMon Feb 21 05:13:22 2005
@@ -51,6 +51,7 @@
const mbfl_encoding *to;
int illegal_mode;
int illegal_substchar;
+ void *opaque;
};
struct mbfl_convert_vtbl {
--
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) / NEWS
moriyoshi Mon Feb 21 05:14:29 2005 EDT Modified files: (Branch: PHP_5_0) /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.253r2=1.1760.2.254ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.253 php-src/NEWS:1.1760.2.254 --- php-src/NEWS:1.1760.2.253 Mon Feb 21 04:45:18 2005 +++ php-src/NEWSMon Feb 21 05:14:29 2005 @@ -102,6 +102,8 @@ - Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia) - Fixed bug #30725 (PHP segfaults when an exception is thrown in getIterator() within foreach). (Marcus) +- Fixed bug #30573 (compiler warnings in libmbfl due to invalid type cast). + (Moriyoshi) - Fixed bug #30549 (incorrect character translations for some ISO8859 charsets). (Moriyoshi) - Fixed bug #30446 (apache2handler: virtual() includes files out of sequence) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring php_mbregex.c
moriyoshi Mon Feb 21 05:19:12 2005 EDT
Modified files:
/php-src/ext/mbstring php_mbregex.c
Log:
- Fix bug #30868 (evaluated pointer comparison in mbregex causes compile
failure).
http://cvs.php.net/diff.php/php-src/ext/mbstring/php_mbregex.c?r1=1.50r2=1.51ty=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.50
php-src/ext/mbstring/php_mbregex.c:1.51
--- php-src/ext/mbstring/php_mbregex.c:1.50 Sun Feb 20 17:18:07 2005
+++ php-src/ext/mbstring/php_mbregex.c Mon Feb 21 05:19:11 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.50 2005/02/20 22:18:07 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.51 2005/02/21 10:19:11 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -501,7 +501,7 @@
zend_get_parameters_ex(1, arg1) != FAILURE) {
convert_to_string_ex(arg1);
mbctype = php_mb_regex_name2mbctype(Z_STRVAL_PP(arg1));
- if (mbctype 0) {
+ if (mbctype == ONIG_ENCODING_UNDEF) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
encoding \%s\, Z_STRVAL_PP(arg1));
RETVAL_FALSE;
} else {
--
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) / NEWS /ext/mbstring php_mbregex.c
moriyoshi Mon Feb 21 05:20:23 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-srcNEWS
/php-src/ext/mbstring php_mbregex.c
Log:
- MFH: fix bug #30868 (evaluated pointer comparison in mbregex causes compile
failure).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.254r2=1.1760.2.255ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.254 php-src/NEWS:1.1760.2.255
--- php-src/NEWS:1.1760.2.254 Mon Feb 21 05:14:29 2005
+++ php-src/NEWSMon Feb 21 05:20:23 2005
@@ -98,6 +98,8 @@
- Fixed bug #31055 (apache2filter: per request leak proportional to the full
path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #30901 (can't send cookies with soap envelop). (Dmitry)
+- Fixed bug #30868 (evaluated pointer comparison in mbregex causes compile
+ failure). (Moriyoshi)
- Fixed bug #30862 (Static array with boolean indexes). (Marcus)
- Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
- Fixed bug #30725 (PHP segfaults when an exception is thrown in getIterator()
http://cvs.php.net/diff.php/php-src/ext/mbstring/php_mbregex.c?r1=1.48.2.1r2=1.48.2.2ty=u
Index: php-src/ext/mbstring/php_mbregex.c
diff -u php-src/ext/mbstring/php_mbregex.c:1.48.2.1
php-src/ext/mbstring/php_mbregex.c:1.48.2.2
--- php-src/ext/mbstring/php_mbregex.c:1.48.2.1 Sun Feb 20 18:02:48 2005
+++ php-src/ext/mbstring/php_mbregex.c Mon Feb 21 05:20:23 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_mbregex.c,v 1.48.2.1 2005/02/20 23:02:48 moriyoshi Exp $ */
+/* $Id: php_mbregex.c,v 1.48.2.2 2005/02/21 10:20:23 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
@@ -501,7 +501,7 @@
zend_get_parameters_ex(1, arg1) != FAILURE) {
convert_to_string_ex(arg1);
mbctype = php_mb_regex_name2mbctype(Z_STRVAL_PP(arg1));
- if (mbctype 0) {
+ if (mbctype == ONIG_ENCODING_UNDEF) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, Unknown
encoding \%s\, Z_STRVAL_PP(arg1));
RETVAL_FALSE;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_4_3) /main SAPI.c
stasMon Feb 21 07:29:05 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/main SAPI.c
Log:
packport fix from PHP5: read post data if they wreen't read
# this is needed for FCGI correct functioning
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.155.2.22r2=1.155.2.23ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.155.2.22 php-src/main/SAPI.c:1.155.2.23
--- php-src/main/SAPI.c:1.155.2.22 Thu Aug 19 16:35:36 2004
+++ php-src/main/SAPI.c Mon Feb 21 07:29:02 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.155.2.22 2004/08/19 20:35:36 bfrance Exp $ */
+/* $Id: SAPI.c,v 1.155.2.23 2005/02/21 12:29:02 stas Exp $ */
#include ctype.h
#include sys/stat.h
@@ -388,6 +388,16 @@
zend_llist_destroy(SG(sapi_headers).headers);
if (SG(request_info).post_data) {
efree(SG(request_info).post_data);
+ } else if (SG(server_context)) {
+ if(sapi_module.read_post) {
+ /* make sure we've consumed all request input data */
+ char dummy[SAPI_POST_BLOCK_SIZE];
+ int read_bytes;
+
+ while((read_bytes = sapi_module.read_post(dummy,
sizeof(dummy)-1 TSRMLS_CC)) 0) {
+ SG(read_post_bytes) += read_bytes;
+ }
+ }
}
if (SG(request_info).raw_post_data) {
efree(SG(request_info).raw_post_data);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mb_gpc.c mbstring.c /main SAPI.c SAPI.h main.c php_content_types.c php_content_types.h
moriyoshi Mon Feb 21 10:14:02 2005 EDT
Modified files:
/php-src/ext/mbstring mb_gpc.c mbstring.c
/php-src/main SAPI.c SAPI.h main.c php_content_types.c
php_content_types.h
Log:
- Fix bug #28568 (known_post_content_types is not thread safe).
# What is eventually necessiated is entire SAPI redesign, I think.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mb_gpc.c?r1=1.13r2=1.14ty=u
Index: php-src/ext/mbstring/mb_gpc.c
diff -u php-src/ext/mbstring/mb_gpc.c:1.13 php-src/ext/mbstring/mb_gpc.c:1.14
--- php-src/ext/mbstring/mb_gpc.c:1.13 Thu Feb 10 09:11:06 2005
+++ php-src/ext/mbstring/mb_gpc.c Mon Feb 21 10:14:01 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mb_gpc.c,v 1.13 2005/02/10 14:11:06 iliaa Exp $ */
+/* $Id: mb_gpc.c,v 1.14 2005/02/21 15:14:01 moriyoshi Exp $ */
/* {{{ includes */
#ifdef HAVE_CONFIG_H
@@ -48,49 +48,22 @@
ZEND_EXTERN_MODULE_GLOBALS(mbstring)
-/* {{{ static sapi_post_entry mbstr_post_entries[] */
-static sapi_post_entry mbstr_post_entries[] = {
- { DEFAULT_POST_CONTENT_TYPE, sizeof(DEFAULT_POST_CONTENT_TYPE)-1,
sapi_read_standard_form_data, php_mb_post_handler },
- { MULTIPART_CONTENT_TYPE,sizeof(MULTIPART_CONTENT_TYPE)-1,NULL,
rfc1867_post_handler },
- { NULL, 0, NULL, NULL }
-};
-/* }}} */
-
-/* {{{ static sapi_post_entry php_post_entries[] */
-static sapi_post_entry php_post_entries[] = {
- { DEFAULT_POST_CONTENT_TYPE, sizeof(DEFAULT_POST_CONTENT_TYPE)-1,
sapi_read_standard_form_data, php_std_post_handler },
- { MULTIPART_CONTENT_TYPE,sizeof(MULTIPART_CONTENT_TYPE)-1,NULL,
rfc1867_post_handler },
- { NULL, 0, NULL, NULL }
-};
-/* }}} */
-
-/* {{{ int _php_mb_enable_encoding_translation(int flag) */
-int _php_mb_enable_encoding_translation(int flag)
-{
- if (flag) {
- sapi_unregister_post_entry(php_post_entries);
- sapi_register_post_entries(mbstr_post_entries);
- sapi_register_treat_data(mbstr_treat_data);
- } else {
- sapi_unregister_post_entry(mbstr_post_entries);
- sapi_register_post_entries(php_post_entries);
- sapi_register_treat_data(php_default_treat_data);
- }
- return SUCCESS;
-}
-/* }}} */
-
/* {{{ MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data)
* http input processing */
MBSTRING_API SAPI_TREAT_DATA_FUNC(mbstr_treat_data)
{
char *res = NULL, *separator=NULL;
const char *c_var;
- pval *array_ptr;
+ zval *array_ptr;
int free_buffer=0;
enum mbfl_no_encoding detected;
php_mb_encoding_handler_info_t info;
+ if (!MBSTRG(encoding_translation)) {
+ php_default_treat_data(arg, str, destArray TSRMLS_CC);
+ return;
+ }
+
switch (arg) {
case PARSE_POST:
case PARSE_GET:
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.218r2=1.219ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.218
php-src/ext/mbstring/mbstring.c:1.219
--- php-src/ext/mbstring/mbstring.c:1.218 Mon Feb 21 02:57:07 2005
+++ php-src/ext/mbstring/mbstring.c Mon Feb 21 10:14:01 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.218 2005/02/21 07:57:07 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.219 2005/02/21 15:14:01 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -227,6 +227,14 @@
};
/* }}} */
+/* {{{ static sapi_post_entry php_post_entries[] */
+static sapi_post_entry php_post_entries[] = {
+ { DEFAULT_POST_CONTENT_TYPE, sizeof(DEFAULT_POST_CONTENT_TYPE)-1,
sapi_read_standard_form_data, php_std_post_handler },
+ { MULTIPART_CONTENT_TYPE,sizeof(MULTIPART_CONTENT_TYPE)-1,NULL,
rfc1867_post_handler },
+ { NULL, 0, NULL, NULL }
+};
+/* }}} */
+
ZEND_DECLARE_MODULE_GLOBALS(mbstring)
#ifdef COMPILE_DL_MBSTRING
@@ -283,6 +291,14 @@
};
/* }}} */
+/* {{{ static sapi_post_entry mbstr_post_entries[] */
+static sapi_post_entry mbstr_post_entries[] = {
+ { DEFAULT_POST_CONTENT_TYPE, sizeof(DEFAULT_POST_CONTENT_TYPE)-1,
sapi_read_standard_form_data, php_mb_post_handler },
+ { MULTIPART_CONTENT_TYPE,sizeof(MULTIPART_CONTENT_TYPE)-1,NULL,
rfc1867_post_handler },
+ { NULL, 0, NULL, NULL }
+};
+/* }}} */
+
/* {{{ static int php_mb_parse_encoding_list()
* Return 0 if input contains any illegal encoding, otherwise 1.
* Even if any illegal encoding is detected the result may contain a list
@@ -680,10 +696,13 @@
OnUpdateBool(entry, new_value, new_value_length,
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
moriyoshi Mon Feb 21 10:14:32 2005 EDT
Modified files:
/php-src/ext/mbstring mbstring.c
Log:
- WS fix.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.219r2=1.220ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.219
php-src/ext/mbstring/mbstring.c:1.220
--- php-src/ext/mbstring/mbstring.c:1.219 Mon Feb 21 10:14:01 2005
+++ php-src/ext/mbstring/mbstring.c Mon Feb 21 10:14:32 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.219 2005/02/21 15:14:01 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.220 2005/02/21 15:14:32 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -2283,7 +2283,6 @@
}
/* }}} */
-
/* {{{ proto string mb_encode_mimeheader(string str [, string charset [,
string transfer-encoding [, string linefeed]]])
Converts the string to MIME encoded-word in the format of
=?charset?(B|Q)?encoded_string?= */
PHP_FUNCTION(mb_encode_mimeheader)
--
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) /ext/mbstring mbstring.c
moriyoshi Mon Feb 21 10:15:08 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/mbstring mbstring.c
Log:
- WS fix.
http://cvs.php.net/diff.php/php-src/ext/mbstring/mbstring.c?r1=1.214.2.3r2=1.214.2.4ty=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.214.2.3
php-src/ext/mbstring/mbstring.c:1.214.2.4
--- php-src/ext/mbstring/mbstring.c:1.214.2.3 Mon Feb 21 03:01:01 2005
+++ php-src/ext/mbstring/mbstring.c Mon Feb 21 10:15:08 2005
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.214.2.3 2005/02/21 08:01:01 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.214.2.4 2005/02/21 15:15:08 moriyoshi Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -2267,7 +2267,6 @@
}
/* }}} */
-
/* {{{ proto string mb_encode_mimeheader(string str [, string charset [,
string transfer-encoding [, string linefeed]]])
Converts the string to MIME encoded-word in the format of
=?charset?(B|Q)?encoded_string?= */
PHP_FUNCTION(mb_encode_mimeheader)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / NEWS
moriyoshi Mon Feb 21 10:17:00 2005 EDT Modified files: /php-srcNEWS Log: - BFN http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1842r2=1.1843ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1842 php-src/NEWS:1.1843 --- php-src/NEWS:1.1842 Mon Feb 14 18:36:15 2005 +++ php-src/NEWSMon Feb 21 10:17:00 2005 @@ -80,6 +80,8 @@ - Fixed bug #29061 (soap extension segfaults). (Dmitry) - Fixed bug #28985 (__getTypes() returning nothing on complex WSDL). (Dmitry) - Fixed bug #28969 (Wrong data encoding of special characters). (Dmitry) +- Fixed bug #28568 (SAPI::known_post_content_types is not thread safe). + (Moriyoshi) 13 Jul 2004, PHP 5.0.0 - Rewritten UNIX and Windows install help files. (Documentation Team) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main SAPI.c
sniper Mon Feb 21 16:00:04 2005 EDT
Modified files:
/php-src/main SAPI.c
Log:
Nuke unused variables when PCRE is not compiled in
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.194r2=1.195ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.194 php-src/main/SAPI.c:1.195
--- php-src/main/SAPI.c:1.194 Mon Feb 21 15:57:18 2005
+++ php-src/main/SAPI.c Mon Feb 21 16:00:04 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.194 2005/02/21 20:57:18 sniper Exp $ */
+/* $Id: SAPI.c,v 1.195 2005/02/21 21:00:04 sniper Exp $ */
#include ctype.h
#include sys/stat.h
@@ -610,8 +610,6 @@
sapi_update_response_code(302
TSRMLS_CC);
}
} else if (!STRCASECMP(header_line,
WWW-Authenticate)) { /* HTTP Authentication */
- int newlen;
- char *result, *newheader;
sapi_update_response_code(401 TSRMLS_CC); /*
authentication-required */
@@ -619,8 +617,8 @@
#if (HAVE_PCRE || HAVE_BUNDLED_PCRE) !defined(COMPILE_DL_PCRE)
{
zval *repl_temp;
- char *ptr = colon_offset+1;
- int ptr_len=0, result_len = 0;
+ char *ptr = colon_offset+1, *result,
*newheader;
+ int ptr_len=0, result_len = 0, newlen =
0;
/* skip white space */
while (isspace(*ptr)) {
--
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) /ext/mysqli/tests skipif.inc
sniper Mon Feb 21 16:41:59 2005 EDT
Added files: (Branch: PHP_5_0)
/php-src/ext/mysqli/tests skipif.inc
Log:
Added missing skipif.inc (bug #31940)
http://cvs.php.net/co.php/php-src/ext/mysqli/tests/skipif.inc?r=1.1p=1
Index: php-src/ext/mysqli/tests/skipif.inc
+++ php-src/ext/mysqli/tests/skipif.inc
?php if (!extension_loaded('mysqli')) die('skip mysqli extension not
available');?
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c /main php_streams.h /main/streams streams.c
iliaa Mon Feb 21 19:24:13 2005 EDT
Modified files:
/php-src/main php_streams.h
/php-src/main/streams streams.c
/php-src/ext/standard dir.c
Log:
Fixed bug #31515 (Improve performance of scandir() by factor of 10 or so).
http://cvs.php.net/diff.php/php-src/main/php_streams.h?r1=1.100r2=1.101ty=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.100 php-src/main/php_streams.h:1.101
--- php-src/main/php_streams.h:1.100Sun Feb 6 18:17:09 2005
+++ php-src/main/php_streams.h Mon Feb 21 19:24:13 2005
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_streams.h,v 1.100 2005/02/06 23:17:09 wez Exp $ */
+/* $Id: php_streams.h,v 1.101 2005/02/22 00:24:13 iliaa Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -328,11 +328,11 @@
#define php_stream_closedir(dirstream) php_stream_close((dirstream))
#define php_stream_rewinddir(dirstream)php_stream_rewind((dirstream))
-PHPAPI int php_stream_dirent_alphasort(const php_stream_dirent **a, const
php_stream_dirent **b);
-PHPAPI int php_stream_dirent_alphasortr(const php_stream_dirent **a, const
php_stream_dirent **b);
+PHPAPI int php_stream_dirent_alphasort(const char **a, const char **b);
+PHPAPI int php_stream_dirent_alphasortr(const char **a, const char **b);
-PHPAPI int _php_stream_scandir(char *dirname, php_stream_dirent **namelist[],
int flags, php_stream_context *context,
- int (*compare) (const php_stream_dirent **a, const
php_stream_dirent **b) TSRMLS_DC);
+PHPAPI int _php_stream_scandir(char *dirname, char **namelist[], int flags,
php_stream_context *context,
+ int (*compare) (const char **a, const char **b)
TSRMLS_DC);
#define php_stream_scandir(dirname, namelist, context, compare)
_php_stream_scandir((dirname), (namelist), 0, (context), (compare) TSRMLS_CC)
PHPAPI int _php_stream_set_option(php_stream *stream, int option, int value,
void *ptrparam TSRMLS_DC);
http://cvs.php.net/diff.php/php-src/main/streams/streams.c?r1=1.70r2=1.71ty=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.70 php-src/main/streams/streams.c:1.71
--- php-src/main/streams/streams.c:1.70 Mon Nov 15 18:43:12 2004
+++ php-src/main/streams/streams.c Mon Feb 21 19:24:13 2005
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: streams.c,v 1.70 2004/11/15 23:43:12 iliaa Exp $ */
+/* $Id: streams.c,v 1.71 2005/02/22 00:24:13 iliaa Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -1944,28 +1944,28 @@
/* {{{ php_stream_dirent_alphasort
*/
-PHPAPI int php_stream_dirent_alphasort(const php_stream_dirent **a, const
php_stream_dirent **b)
+PHPAPI int php_stream_dirent_alphasort(const char **a, const char **b)
{
- return strcoll((*a)-d_name,(*b)-d_name);
+ return strcoll(*a, *b);
}
/* }}} */
/* {{{ php_stream_dirent_alphasortr
*/
-PHPAPI int php_stream_dirent_alphasortr(const php_stream_dirent **a, const
php_stream_dirent **b)
+PHPAPI int php_stream_dirent_alphasortr(const char **a, const char **b)
{
- return strcoll((*b)-d_name,(*a)-d_name);
+ return strcoll(*b, *a);
}
/* }}} */
/* {{{ php_stream_scandir
*/
-PHPAPI int _php_stream_scandir(char *dirname, php_stream_dirent **namelist[],
int flags, php_stream_context *context,
- int (*compare) (const php_stream_dirent **a, const
php_stream_dirent **b) TSRMLS_DC)
+PHPAPI int _php_stream_scandir(char *dirname, char **namelist[], int flags,
php_stream_context *context,
+ int (*compare) (const char **a, const char **b)
TSRMLS_DC)
{
php_stream *stream;
php_stream_dirent sdp;
- php_stream_dirent **vector = NULL;
+ char **vector = NULL;
int vector_size = 0;
int nfiles = 0;
@@ -1985,11 +1985,10 @@
} else {
vector_size *= 2;
}
- vector = (php_stream_dirent **) erealloc(vector,
vector_size * sizeof(php_stream_dirent *));
+ vector = (char **) erealloc(vector, vector_size *
sizeof(char *));
}
- vector[nfiles] = emalloc(sizeof(php_stream_dirent));
- memcpy(vector[nfiles], sdp, sizeof(sdp));
+ vector[nfiles] = estrdup(sdp.d_name);
nfiles++;
}
@@ -1998,7 +1997,7 @@
*namelist = vector;
if (compare) {
- qsort(*namelist, nfiles, sizeof(php_stream_dirent *),
(int(*)(const void *, const void *))compare);
+ qsort(*namelist, nfiles, sizeof(char *), (int(*)(const void *,
const void *))compare);
}
return nfiles;
}
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.141r2=1.142ty=u
Index: php-src/ext/standard/dir.c
diff -u
[PHP-CVS] cvs: php-src /main SAPI.c
moriyoshi Tue Feb 22 00:07:38 2005 EDT
Modified files:
/php-src/main SAPI.c
Log:
- Silly typo.
http://cvs.php.net/diff.php/php-src/main/SAPI.c?r1=1.195r2=1.196ty=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.195 php-src/main/SAPI.c:1.196
--- php-src/main/SAPI.c:1.195 Mon Feb 21 16:00:04 2005
+++ php-src/main/SAPI.c Tue Feb 22 00:07:37 2005
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: SAPI.c,v 1.195 2005/02/21 21:00:04 sniper Exp $ */
+/* $Id: SAPI.c,v 1.196 2005/02/22 05:07:37 moriyoshi Exp $ */
#include ctype.h
#include sys/stat.h
@@ -94,7 +94,7 @@
SAPI_API void sapi_shutdown(void)
{
#ifdef ZTS
- ts_free_id(sapi_globals_id);
+ ts_free_id(sapi_globals_id);
#else
sapi_globals_dtor(sapi_globals);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
