cataphract Thu, 24 Nov 2011 22:45:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=319781
Log:
- Updated UPGRADING, protos and attribution in ext/intl/idn/idn.c
Changed paths:
U php/php-src/branches/PHP_5_4/UPGRADING
U php/php-src/branches/PHP_5_4/ext/intl/idn/idn.c
U php/php-src/trunk/ext/intl/idn/idn.c
Modified: php/php-src/branches/PHP_5_4/UPGRADING
===================================================================
--- php/php-src/branches/PHP_5_4/UPGRADING 2011-11-24 21:01:39 UTC (rev
319780)
+++ php/php-src/branches/PHP_5_4/UPGRADING 2011-11-24 22:45:50 UTC (rev
319781)
@@ -217,8 +217,8 @@
to cURL.
- Added optional argument to debug_backtrace() and debug_print_backtrace()
to limit the amount of stack frames returned.
-- Fixed crypt_blowfish handling of 8-bit characters. crypt() in Blowfish mode
now
- supports hashes marked $2a$, $2x$, $2y$ and $2z$.
+- Fixed crypt_blowfish handling of 8-bit characters. crypt() in Blowfish mode
+ now supports hashes marked $2a$, $2x$, $2y$ and $2z$.
- mbstring now supports following encodings: Shift_JIS/UTF-8 Emoji,
JIS X0213:2004 (Shift_JIS-2004, EUC-JP-2004, ISO-2022-JP-2004),
MacJapanese (Shift_JIS), gb18030.
@@ -230,7 +230,11 @@
and true for is_subclass_of() for BC reasons.
- ob_start() will now treat a chunk size of 1 as meaning 1 byte, rather than
the previous special case behaviour of treating it as 4096 bytes.
+- idn_to_ascii() and idn_to_utf8() now take two extra parameters, one
indicating
+ the variant (IDNA 2003 or UTS #46) and another, passed by reference, to
return
+ details about the operation in case UTS #46 is chosen.
+
===================================
5. Changes made to existing methods
===================================
@@ -594,6 +598,26 @@
- ZLIB_ENCODING_DEFLATE
- ZLIB_ENCODING_GZIP
- ZLIB_ENCODING_RAW
+ - U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR
+ - IDNA_CHECK_BIDI
+ - IDNA_CHECK_CONTEXTJ
+ - IDNA_NONTRANSITIONAL_TO_ASCII
+ - IDNA_NONTRANSITIONAL_TO_UNICODE
+ - INTL_IDNA_VARIANT_2003
+ - INTL_IDNA_VARIANT_UTS46
+ - IDNA_ERROR_EMPTY_LABEL
+ - IDNA_ERROR_LABEL_TOO_LONG
+ - IDNA_ERROR_DOMAIN_NAME_TOO_LONG
+ - IDNA_ERROR_LEADING_HYPHEN
+ - IDNA_ERROR_TRAILING_HYPHEN
+ - IDNA_ERROR_HYPHEN_3_4
+ - IDNA_ERROR_LEADING_COMBINING_MARK
+ - IDNA_ERROR_DISALLOWED
+ - IDNA_ERROR_PUNYCODE
+ - IDNA_ERROR_LABEL_HAS_DOT
+ - IDNA_ERROR_INVALID_ACE_LABEL
+ - IDNA_ERROR_BIDI
+ - IDNA_ERROR_CONTEXTJ
c. New classes
Modified: php/php-src/branches/PHP_5_4/ext/intl/idn/idn.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/intl/idn/idn.c 2011-11-24 21:01:39 UTC
(rev 319780)
+++ php/php-src/branches/PHP_5_4/ext/intl/idn/idn.c 2011-11-24 22:45:50 UTC
(rev 319781)
@@ -13,6 +13,7 @@
| [email protected] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Pierre A. Joye <[email protected]> |
+ | Gustavo Lopes <[email protected]> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
@@ -322,7 +323,7 @@
#endif
}
-/* {{{ proto int idn_to_ascii(string domain[, int options])
+/* {{{ proto int idn_to_ascii(string domain[, int options[, int variant[,
array &idna_info]]])
Converts an Unicode domain to ASCII representation, as defined in the IDNA
RFC */
PHP_FUNCTION(idn_to_ascii)
{
@@ -331,7 +332,7 @@
/* }}} */
-/* {{{ proto int idn_to_utf8(string domain[, int options])
+/* {{{ proto int idn_to_utf8(string domain[, int options[, int variant[, array
&idna_info]]])
Converts an ASCII representation of the domain to Unicode (UTF-8), as
defined in the IDNA RFC */
PHP_FUNCTION(idn_to_utf8)
{
Modified: php/php-src/trunk/ext/intl/idn/idn.c
===================================================================
--- php/php-src/trunk/ext/intl/idn/idn.c 2011-11-24 21:01:39 UTC (rev
319780)
+++ php/php-src/trunk/ext/intl/idn/idn.c 2011-11-24 22:45:50 UTC (rev
319781)
@@ -13,6 +13,7 @@
| [email protected] so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Pierre A. Joye <[email protected]> |
+ | Gustavo Lopes <[email protected]> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
@@ -322,7 +323,7 @@
#endif
}
-/* {{{ proto int idn_to_ascii(string domain[, int options])
+/* {{{ proto int idn_to_ascii(string domain[, int options[, int variant[,
array &idna_info]]])
Converts an Unicode domain to ASCII representation, as defined in the IDNA
RFC */
PHP_FUNCTION(idn_to_ascii)
{
@@ -331,7 +332,7 @@
/* }}} */
-/* {{{ proto int idn_to_utf8(string domain[, int options])
+/* {{{ proto int idn_to_utf8(string domain[, int options[, int variant[, array
&idna_info]]])
Converts an ASCII representation of the domain to Unicode (UTF-8), as
defined in the IDNA RFC */
PHP_FUNCTION(idn_to_utf8)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
