[PHP-CVS] cvs: CVSROOT / avail

2006-11-02 Thread Rasmus Lerdorf
rasmus  Thu Nov  2 09:09:27 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  doc-pl access for adi
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1204r2=1.1205diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1204 CVSROOT/avail:1.1205
--- CVSROOT/avail:1.1204Tue Oct 31 22:05:08 2006
+++ CVSROOT/avail   Thu Nov  2 09:09:27 2006
@@ -92,7 +92,7 @@
 avail|mkoula|phpdoc-cs
 avail|xdanger|phpdoc-zh,phpdoc-hk
 avail|freespace,shaff,sveta,wanderer,kozloffsky|phpdoc-ru
-avail|cyb0org,lach|phpdoc-pl
+avail|cyb0org,lach,adi|phpdoc-pl
 avail|chappy|phpdoc-hu
 avail|jacques|phpdoc,pear/Validate
 
avail|cumhuronat,gulenzek,xhandros,neoprobe,faruk,infralite,flarecaster,antimon|phpdoc-tr

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: CVSROOT / avail

2006-11-02 Thread Wez Furlong
wez Thu Nov  2 18:22:33 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  karma/acl for ibm sam project
  
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1205r2=1.1206diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1205 CVSROOT/avail:1.1206
--- CVSROOT/avail:1.1205Thu Nov  2 09:09:27 2006
+++ CVSROOT/avail   Thu Nov  2 18:22:33 2006
@@ -372,12 +372,13 @@
 # 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/sdo,pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm
+unavail||pecl/ibm_db2,pecl/sdo,pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm,pecl/sam
 avail|dbs,skoduru,kraman,kfbombar,tessus|pecl/ibm_db2,pecl/pdo_ibm
 avail|wez,dbs|pecl/pdo_odbc,php-src/ext/pdo_odbc
 avail|gcc,cem,mfp,ansriniv,slaws|pecl/sdo
 avail|dbs,kraman,kfbombar|pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm
 avail|ifeghali|pear/MDB2_Schema
+avail|dsr!pecl/sam
 
 # preprocessor karma
 avail|merlin|pecl/preprocessor

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: CVSROOT / avail

2006-11-02 Thread Wez Furlong
wez Thu Nov  2 18:47:54 2006 UTC

  Modified files:  
/CVSROOTavail 
  Log:
  typo
  
http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1206r2=1.1207diff_format=u
Index: CVSROOT/avail
diff -u CVSROOT/avail:1.1206 CVSROOT/avail:1.1207
--- CVSROOT/avail:1.1206Thu Nov  2 18:22:33 2006
+++ CVSROOT/avail   Thu Nov  2 18:47:54 2006
@@ -378,7 +378,7 @@
 avail|gcc,cem,mfp,ansriniv,slaws|pecl/sdo
 avail|dbs,kraman,kfbombar|pecl/pdo_ids,pecl/pdo_informix,pecl/pdo_ibm
 avail|ifeghali|pear/MDB2_Schema
-avail|dsr!pecl/sam
+avail|dsr|pecl/sam
 
 # preprocessor karma
 avail|merlin|pecl/preprocessor

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring config.m4 /ext/mbstring/libmbfl/filters Makefile.am mbfilter_cp51932.c mbfilter_cp51932.h mbfilter_euc_jp_win.c mbfilter_jis.c mbfilter_jis.h unicode_tab

2006-11-02 Thread Rui Hirokawa
hirokawaFri Nov  3 01:11:35 2006 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/mbstring/libmbfl/filters   mbfilter_cp51932.c 
mbfilter_cp51932.h 

  Modified files:  
/php-src/ext/mbstring   config.m4 
/php-src/ext/mbstring/libmbfl/filters   Makefile.am 
mbfilter_euc_jp_win.c 
mbfilter_jis.c mbfilter_jis.h 
unicode_table_jis.h 
/php-src/ext/mbstring/libmbfl/mbfl  mbfl_convert.c mbfl_encoding.c 
mbfl_encoding.h mbfl_ident.c 
  Log:
  added japanese legacy encoding support (made by [EMAIL PROTECTED])
  http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/config.m4?r1=1.58.2.4.2.6r2=1.58.2.4.2.7diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.58.2.4.2.6 
php-src/ext/mbstring/config.m4:1.58.2.4.2.7
--- php-src/ext/mbstring/config.m4:1.58.2.4.2.6 Sun Oct  1 08:34:39 2006
+++ php-src/ext/mbstring/config.m4  Fri Nov  3 01:11:35 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.58.2.4.2.6 2006/10/01 08:34:39 hirokawa Exp $
+dnl $Id: config.m4,v 1.58.2.4.2.7 2006/11/03 01:11:35 hirokawa Exp $
 dnl
 
 AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -189,6 +189,7 @@
  libmbfl/filters/mbfilter_euc_cn.c
  libmbfl/filters/mbfilter_euc_jp.c
  libmbfl/filters/mbfilter_euc_jp_win.c
+ libmbfl/filters/mbfilter_cp51932.c
  libmbfl/filters/mbfilter_euc_kr.c
  libmbfl/filters/mbfilter_euc_tw.c
  libmbfl/filters/mbfilter_htmlent.c
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/libmbfl/filters/Makefile.am?r1=1.4r2=1.4.4.1diff_format=u
Index: php-src/ext/mbstring/libmbfl/filters/Makefile.am
diff -u php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4 
php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4.4.1
--- php-src/ext/mbstring/libmbfl/filters/Makefile.am:1.4Tue Mar 22 
22:22:10 2005
+++ php-src/ext/mbstring/libmbfl/filters/Makefile.amFri Nov  3 01:11:35 2006
@@ -2,7 +2,7 @@
 noinst_LTLIBRARIES=libmbfl_filters.la
 INCLUDES=-I../mbfl
 libmbfl_filters_la_LDFLAGS=-version-info $(SHLIB_VERSION)
-libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c 
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c mbfilter_iso8859_1.c 
mbfilter_iso8859_2.c mbfilter_cp1252.c mbfilter_cp1251.c mbfilter_ascii.c 
mbfilter_iso8859_3.c mbfilter_iso8859_4.c mbfilter_iso8859_5.c 
mbfilter_iso8859_6.c mbfilter_iso8859_7.c mbfilter_iso8859_8.c 
mbfilter_iso8859_9.c mbfilter_iso8859_10.c mbfilter_iso8859_13.c 
mbfilter_iso8859_14.c mbfilter_iso8859_15.c mbfilter_iso8859_16.c 
mbfilter_htmlent.c mbfilter_byte2.c mbfilter_byte4.c mbfilter_uuencode.c 
mbfilter_base64.c mbfilter_sjis.c mbfilter_7bit.c mbfilter_qprint.c 
mbfilter_ucs4.c mbfilter_ucs2.c mbfilter_utf32.c mbfilter_utf16.c 
mbfilter_utf8.c mbfilter_utf7.c mbfilter_utf7imap.c mbfilter_euc_jp_win.c 
mbfilter_cp932.c mbfilter_euc_cn.c mbfilter_euc_kr.c mbfilter_uhc.c 
mbfilter_iso2022_kr.c mbfilter_cp866.c mbfilter_koi8r.c mbfilter_armscii8.c 
html_entities.c cp932_table.h html_entities.h mbfilter_7bit.h mbfilter_ascii.h 
mbfilte!
 r_base64.h mbfilter_big5.h mbfilter_byte2.h mbfilter_byte4.h mbfilter_cp1251.h 
mbfilter_cp1252.h mbfilter_cp866.h mbfilter_cp932.h mbfilter_cp936.h 
mbfilter_euc_cn.h mbfilter_euc_jp.h mbfilter_euc_jp_win.h mbfilter_euc_kr.h 
mbfilter_euc_tw.h mbfilter_htmlent.h mbfilter_hz.h mbfilter_iso2022_kr.h 
mbfilter_iso8859_1.h mbfilter_iso8859_10.h mbfilter_iso8859_13.h 
mbfilter_iso8859_14.h mbfilter_iso8859_15.h mbfilter_iso8859_16.h 
mbfilter_iso8859_2.h mbfilter_iso8859_3.h mbfilter_iso8859_4.h 
mbfilter_iso8859_5.h mbfilter_iso8859_6.h mbfilter_iso8859_7.h 
mbfilter_iso8859_8.h mbfilter_iso8859_9.h mbfilter_jis.h mbfilter_koi8r.h 
mbfilter_armscii8.h mbfilter_qprint.h mbfilter_sjis.h mbfilter_ucs2.h 
mbfilter_ucs4.h mbfilter_uhc.h mbfilter_utf16.h mbfilter_utf32.h 
mbfilter_utf7.h mbfilter_utf7imap.h mbfilter_utf8.h mbfilter_uuencode.h 
unicode_prop.h unicode_table_big5.h unicode_table_cns11643.h 
unicode_table_cp1251.h unicode_table_cp1252.h unicode_table_cp866.h 
unicode_table_cp932_ext.!
 h unicode_table_cp936.h unicode_table_iso8859_10.h unicode_table_iso88
59_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 
unicode_table_jis.h unicode_table_koi8r.h unicode_table_armscii8.h 
unicode_table_uhc.h
+libmbfl_filters_la_SOURCES=mbfilter_cp936.c mbfilter_hz.c mbfilter_euc_tw.c 
mbfilter_big5.c mbfilter_euc_jp.c mbfilter_jis.c mbfilter_iso8859_1.c 
mbfilter_iso8859_2.c mbfilter_cp1252.c mbfilter_cp1251.c mbfilter_ascii.c 

[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mbstring mbstring.c

2006-11-02 Thread Rui Hirokawa
hirokawaFri Nov  3 02:24:50 2006 UTC

  Modified files:  (Branch: PHP_4_4)
/php-src/ext/mbstring   mbstring.c 
  Log:
  fixed illegal encoding detection when mbstring.encoding_translation is 
enabled.(made by komura)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.142.2.47.2.17r2=1.142.2.47.2.18diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.142.2.47.2.17 
php-src/ext/mbstring/mbstring.c:1.142.2.47.2.18
--- php-src/ext/mbstring/mbstring.c:1.142.2.47.2.17 Mon Apr  3 13:04:13 2006
+++ php-src/ext/mbstring/mbstring.c Fri Nov  3 02:24:50 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.142.2.47.2.17 2006/04/03 13:04:13 masugata Exp $ */
+/* $Id: mbstring.c,v 1.142.2.47.2.18 2006/11/03 02:24:50 hirokawa Exp $ */
 
 /*
  * PHP4 Multibyte String module mbstring
@@ -1013,7 +1013,10 @@
MBSTRG(current_http_output_encoding) = MBSTRG(http_output_encoding);
MBSTRG(current_filter_illegal_mode) = MBSTRG(filter_illegal_mode);
MBSTRG(current_filter_illegal_substchar) = 
MBSTRG(filter_illegal_substchar);
-   MBSTRG(illegalchars) = 0;
+
+   if (!MBSTRG(encoding_translation)) {
+   MBSTRG(illegalchars) = 0;
+   }
 
n = 0;
if (MBSTRG(detect_order_list)) {
@@ -1774,6 +1777,8 @@
info.num_from_encodings = MBSTRG(http_input_list_size); 
info.from_language  = MBSTRG(language);
 
+   MBSTRG(illegalchars) = 0;
+
detected = php_mbstr_encoding_handler(info, array_ptr, res TSRMLS_CC);
MBSTRG(http_input_identify) = detected;
 
@@ -3864,8 +3869,13 @@
 
if (ret != NULL) {
MBSTRG(illegalchars) += illegalchars;
-   efree(ret-val);
-   RETURN_BOOL(illegalchars == 0);
+   if (illegalchars == 0  strncmp(string.val, ret-val, 
string.len) == 0) {
+   efree(ret-val);
+   RETURN_TRUE;
+   } else {
+   efree(ret-val);
+   RETURN_FALSE;
+   }
} else {
RETURN_FALSE;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] cvs: php-src(PHP_5_2) /ext/mbstring mb_gpc.c mbstring.c

2006-11-02 Thread Rui Hirokawa
hirokawaFri Nov  3 02:26:50 2006 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/mbstring   mb_gpc.c mbstring.c 
  Log:
  fixed illegal encoding detection when mbstring.encoding_translation is 
enabled.(made by komura)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mb_gpc.c?r1=1.17.2.2r2=1.17.2.2.2.1diff_format=u
Index: php-src/ext/mbstring/mb_gpc.c
diff -u php-src/ext/mbstring/mb_gpc.c:1.17.2.2 
php-src/ext/mbstring/mb_gpc.c:1.17.2.2.2.1
--- php-src/ext/mbstring/mb_gpc.c:1.17.2.2  Sun Jan  1 12:50:08 2006
+++ php-src/ext/mbstring/mb_gpc.c   Fri Nov  3 02:26:50 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mb_gpc.c,v 1.17.2.2 2006/01/01 12:50:08 sniper Exp $ */
+/* $Id: mb_gpc.c,v 1.17.2.2.2.1 2006/11/03 02:26:50 hirokawa Exp $ */
 
 /* {{{ includes */
 #ifdef HAVE_CONFIG_H
@@ -154,6 +154,8 @@
info.num_from_encodings = MBSTRG(http_input_list_size); 
info.from_language  = MBSTRG(language);
 
+   MBSTRG(illegalchars) = 0;
+
detected = _php_mb_encoding_handler_ex(info, array_ptr, res TSRMLS_CC);
MBSTRG(http_input_identify) = detected;
 
@@ -346,6 +348,7 @@
}
 
if (convd != NULL) {
+   MBSTRG(illegalchars) += mbfl_buffer_illegalchars(convd);
mbfl_buffer_converter_delete(convd);
}
if (val_list != NULL) {
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.15r2=1.224.2.22.2.16diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.15 
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.16
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.15 Sun Sep 24 07:10:54 2006
+++ php-src/ext/mbstring/mbstring.c Fri Nov  3 02:26:50 2006
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.224.2.22.2.15 2006/09/24 07:10:54 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.16 2006/11/03 02:26:50 hirokawa Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -933,7 +933,10 @@
MBSTRG(current_http_output_encoding) = MBSTRG(http_output_encoding);
MBSTRG(current_filter_illegal_mode) = MBSTRG(filter_illegal_mode);
MBSTRG(current_filter_illegal_substchar) = 
MBSTRG(filter_illegal_substchar);
-   MBSTRG(illegalchars) = 0;
+
+   if (!MBSTRG(encoding_translation)) {
+   MBSTRG(illegalchars) = 0;
+   }
 
n = 0;
if (MBSTRG(detect_order_list)) {
@@ -4053,8 +4056,13 @@
 
if (ret != NULL) {
MBSTRG(illegalchars) += illegalchars;
-   efree(ret-val);
-   RETURN_BOOL(illegalchars == 0);
+   if (illegalchars == 0  strncmp(string.val, ret-val, 
string.len) == 0) {
+   efree(ret-val);
+   RETURN_TRUE;
+   } else {
+   efree(ret-val);
+   RETURN_FALSE;
+   }
} else {
RETURN_FALSE;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php