[PHP-CVS] svn: php/php-src/trunk/ext/standard/ url.c
andrei Thu, 16 Jul 2009 22:08:02 +
URL: http://svn.php.net/viewvc?view=revision&revision=284205
Changed paths:
U php/php-src/trunk/ext/standard/url.c
Log:
Adjust rawurlencode() according to PDM notes.
Modified: php/php-src/trunk/ext/standard/url.c
===
--- php/php-src/trunk/ext/standard/url.c2009-07-16 21:50:19 UTC (rev
284204)
+++ php/php-src/trunk/ext/standard/url.c2009-07-16 22:08:02 UTC (rev
284205)
@@ -695,15 +695,36 @@
URL-encodes string */
PHP_FUNCTION(rawurlencode)
{
- char *in_str, *out_str;
+ zstr in_str;
+ char *out_str;
int in_str_len, out_str_len;
+ zend_uchar in_str_type;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &in_str,
- &in_str_len) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &in_str,
+ &in_str_len,
&in_str_type) == FAILURE) {
return;
}
- out_str = php_raw_url_encode(in_str, in_str_len, &out_str_len);
+ if (in_str_type == IS_UNICODE) {
+ char *utf8_str = NULL;
+ int utf8_str_len;
+ UErrorCode status = U_ZERO_ERROR;
+
+ zend_unicode_to_string_ex(UG(utf8_conv), &utf8_str,
&utf8_str_len, in_str.u, in_str_len, &status);
+ if (U_FAILURE(status)) {
+ if (utf8_str) {
+ efree(utf8_str);
+ }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
convert argument to UTF-8");
+ RETURN_FALSE;
+ }
+
+ out_str = php_raw_url_encode(utf8_str, utf8_str_len,
&out_str_len);
+ efree(utf8_str);
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, "expecting binary
parameter, received Unicode parameter was converted to UTF-8");
+ } else {
+ out_str = php_raw_url_encode(in_str.s, in_str_len,
&out_str_len);
+ }
RETURN_STRINGL(out_str, out_str_len, 0);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: php/php-src/trunk/ext/standard/ url.c
andrei Thu, 16 Jul 2009 21:48:10 +
URL: http://svn.php.net/viewvc?view=revision&revision=284203
Changed paths:
U php/php-src/trunk/ext/standard/url.c
Log:
Adjust urlencode() according to PDM notes.
Modified: php/php-src/trunk/ext/standard/url.c
===
--- php/php-src/trunk/ext/standard/url.c2009-07-16 21:47:49 UTC (rev
284202)
+++ php/php-src/trunk/ext/standard/url.c2009-07-16 21:48:10 UTC (rev
284203)
@@ -573,15 +573,36 @@
URL-encodes string */
PHP_FUNCTION(urlencode)
{
- char *in_str, *out_str;
+ zstr in_str;
+ char *out_str;
int in_str_len, out_str_len;
+ zend_uchar in_str_type;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &in_str,
- &in_str_len) ==
FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t", &in_str,
+ &in_str_len,
&in_str_type) == FAILURE) {
return;
}
- out_str = php_url_encode(in_str, in_str_len, &out_str_len);
+ if (in_str_type == IS_UNICODE) {
+ char *utf8_str = NULL;
+ int utf8_str_len;
+ UErrorCode status = U_ZERO_ERROR;
+
+ zend_unicode_to_string_ex(UG(utf8_conv), &utf8_str,
&utf8_str_len, in_str.u, in_str_len, &status);
+ if (U_FAILURE(status)) {
+ if (utf8_str) {
+ efree(utf8_str);
+ }
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not
convert argument to UTF-8");
+ RETURN_FALSE;
+ }
+
+ out_str = php_url_encode(utf8_str, utf8_str_len, &out_str_len);
+ efree(utf8_str);
+ php_error_docref(NULL TSRMLS_CC, E_STRICT, "expecting binary
parameter, received Unicode parameter was converted to UTF-8");
+ } else {
+ out_str = php_url_encode(in_str.s, in_str_len, &out_str_len);
+ }
RETURN_STRINGL(out_str, out_str_len, 0);
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
