andrei Thu Oct 26 17:33:33 2006 UTC
Modified files:
/php-src/ext/standard base64.c url.c
Log:
Make url encoding/decoding functions use binary strings only.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/base64.c?r1=1.49&r2=1.50&diff_format=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.49 php-src/ext/standard/base64.c:1.50
--- php-src/ext/standard/base64.c:1.49 Mon Sep 25 01:27:11 2006
+++ php-src/ext/standard/base64.c Thu Oct 26 17:33:33 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: base64.c,v 1.49 2006/09/25 01:27:11 pollita Exp $ */
+/* $Id: base64.c,v 1.50 2006/10/26 17:33:33 andrei Exp $ */
#include <string.h>
@@ -203,7 +203,7 @@
}
/* }}} */
-/* {{{ proto string base64_encode(string str) U
+/* {{{ proto binary base64_encode(binary str) U
Encodes string using MIME base64 algorithm */
PHP_FUNCTION(base64_encode)
{
@@ -224,7 +224,7 @@
/* }}} */
-/* {{{ proto string base64_decode(string str[, bool strict]) U
+/* {{{ proto binary base64_decode(binary str[, bool strict]) U
Decodes string using MIME base64 algorithm */
PHP_FUNCTION(base64_decode)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.100&r2=1.101&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.100 php-src/ext/standard/url.c:1.101
--- php-src/ext/standard/url.c:1.100 Sun Oct 8 13:34:24 2006
+++ php-src/ext/standard/url.c Thu Oct 26 17:33:33 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.100 2006/10/08 13:34:24 bjori Exp $ */
+/* $Id: url.c,v 1.101 2006/10/26 17:33:33 andrei Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -488,14 +488,14 @@
}
/* }}} */
-/* {{{ proto string urlencode(string str)
+/* {{{ proto string urlencode(binary str) U
URL-encodes string */
PHP_FUNCTION(urlencode)
{
char *in_str, *out_str;
int in_str_len, out_str_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &in_str,
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &in_str,
&in_str_len) ==
FAILURE) {
return;
}
@@ -505,7 +505,7 @@
}
/* }}} */
-/* {{{ proto string urldecode(string str)
+/* {{{ proto binary urldecode(binary str) U
Decodes URL-encoded string */
PHP_FUNCTION(urldecode)
{
@@ -589,7 +589,7 @@
}
/* }}} */
-/* {{{ proto string rawurlencode(string str)
+/* {{{ proto binary rawurlencode(binary str) U
URL-encodes string */
PHP_FUNCTION(rawurlencode)
{
@@ -606,7 +606,7 @@
}
/* }}} */
-/* {{{ proto string rawurldecode(string str)
+/* {{{ proto binary rawurldecode(binary str) U
Decodes URL-encodes string */
PHP_FUNCTION(rawurldecode)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php