com php-src: fixes to url processing stuff: ext/spl/php_spl .h ext/standard/url.c ext/standard/url.h
| From: | Anatol Belski | Date: | Wed, 16 Oct 2013 09:32:17 +0000 |
| Subject: | com php-src: fixes to url processing stuff: ext/spl/php_spl .h ext/standard/url.c ext/standard/url.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73512@lists.php.net to get a copy of this message | ||
Commit: 98ec9fdd51c59e8eabde065e215530077e8860e9
Author: Anatol Belski <ab@php.net> Thu, 11 Jul 2013 06:57:22 -0700
Parents: 6221ea90cb93608bd11a72ce3c9b15ef5ae18115
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=98ec9fdd51c59e8eabde065e215530077e8860e9
Log:
fixes to url processing stuff
Changed paths:
M ext/spl/php_spl.h
M ext/standard/url.c
M ext/standard/url.h
Diff:
diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h
index 28aa19d..d3f040a 100644
--- a/ext/spl/php_spl.h
+++ b/ext/spl/php_spl.h
@@ -61,7 +61,7 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
char * autoload_extensions;
HashTable * autoload_functions;
int autoload_running;
- int autoload_extensions_len;
+ zend_str_size_int autoload_extensions_len;
intptr_t hash_mask_handle;
intptr_t hash_mask_handlers;
int hash_mask_init;
diff --git a/ext/standard/url.c b/ext/standard/url.c
index 58f3cca..16069ba 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -61,7 +61,7 @@ PHPAPI void php_url_free(php_url *theurl)
/* {{{ php_replace_controlchars
*/
-PHPAPI char *php_replace_controlchars_ex(char *str, int len)
+PHPAPI char *php_replace_controlchars_ex(char *str, zend_str_size_int len)
{
unsigned char *s = (unsigned char *)str;
unsigned char *e = (unsigned char *)str + len;
@@ -94,7 +94,7 @@ PHPAPI php_url *php_url_parse(char const *str)
/* {{{ php_url_parse
*/
-PHPAPI php_url *php_url_parse_ex(char const *str, int length)
+PHPAPI php_url *php_url_parse_ex(char const *str, zend_str_size_int length)
{
char port_buf[6];
php_url *ret = ecalloc(1, sizeof(php_url));
@@ -375,11 +375,11 @@ end:
PHP_FUNCTION(parse_url)
{
char *str;
- int str_len;
+ zend_str_size_int str_len;
php_url *resource;
long key = -1;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &str_len,
&key) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|l", &str, &str_len,
&key) == FAILURE) {
return;
}
@@ -485,7 +485,7 @@ static unsigned char hexchars[] = "0123456789ABCDEF";
/* {{{ php_url_encode
*/
-PHPAPI char *php_url_encode(char const *s, int len, int *new_length)
+PHPAPI char *php_url_encode(char const *s, zend_str_size_int len, zend_str_size_int *new_length)
{
register unsigned char c;
unsigned char *to, *start;
@@ -534,9 +534,9 @@ PHPAPI char *php_url_encode(char const *s, int len, int *new_length)
PHP_FUNCTION(urlencode)
{
char *in_str, *out_str;
- int in_str_len, out_str_len;
+ zend_str_size_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;
}
@@ -551,9 +551,9 @@ PHP_FUNCTION(urlencode)
PHP_FUNCTION(urldecode)
{
char *in_str, *out_str;
- int in_str_len, out_str_len;
+ zend_str_size_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;
}
@@ -567,7 +567,7 @@ PHP_FUNCTION(urldecode)
/* {{{ php_url_decode
*/
-PHPAPI int php_url_decode(char *str, int len)
+PHPAPI zend_str_size_int php_url_decode(char *str, zend_str_size_int len)
{
char *dest = str;
char *data = str;
@@ -598,7 +598,7 @@ PHPAPI int php_url_decode(char *str, int len)
/* {{{ php_raw_url_encode
*/
-PHPAPI char *php_raw_url_encode(char const *s, int len, int *new_length)
+PHPAPI char *php_raw_url_encode(char const *s, zend_str_size_int len, zend_str_size_int
*new_length)
{
register int x, y;
unsigned char *str;
@@ -635,9 +635,9 @@ PHPAPI char *php_raw_url_encode(char const *s, int len, int *new_length)
PHP_FUNCTION(rawurlencode)
{
char *in_str, *out_str;
- int in_str_len, out_str_len;
+ zend_str_size_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;
}
@@ -652,9 +652,9 @@ PHP_FUNCTION(rawurlencode)
PHP_FUNCTION(rawurldecode)
{
char *in_str, *out_str;
- int in_str_len, out_str_len;
+ zend_str_size_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;
}
@@ -668,7 +668,7 @@ PHP_FUNCTION(rawurldecode)
/* {{{ php_raw_url_decode
*/
-PHPAPI int php_raw_url_decode(char *str, int len)
+PHPAPI zend_str_size_int php_raw_url_decode(char *str, zend_str_size_int len)
{
char *dest = str;
char *data = str;
@@ -699,7 +699,7 @@ PHPAPI int php_raw_url_decode(char *str, int len)
PHP_FUNCTION(get_headers)
{
char *url;
- int url_len;
+ zend_str_size_int url_len;
php_stream_context *context;
php_stream *stream;
zval **prev_val, **hdr = NULL, **h;
@@ -707,7 +707,7 @@ PHP_FUNCTION(get_headers)
HashTable *hashT;
long format = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &url, &url_len,
&format) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S|l", &url, &url_len,
&format) == FAILURE) {
return;
}
context = FG(default_context) ? FG(default_context) : (FG(default_context) =
php_stream_context_alloc(TSRMLS_C));
diff --git a/ext/standard/url.h b/ext/standard/url.h
index 87e2efb..03e0068 100644
--- a/ext/standard/url.h
+++ b/ext/standard/url.h
@@ -33,11 +33,11 @@ typedef struct php_url {
PHPAPI void php_url_free(php_url *theurl);
PHPAPI php_url *php_url_parse(char const *str);
-PHPAPI php_url *php_url_parse_ex(char const *str, int length);
-PHPAPI int php_url_decode(char *str, int len); /* return value: length of decoded string */
-PHPAPI int php_raw_url_decode(char *str, int len); /* return value: length of decoded string */
-PHPAPI char *php_url_encode(char const *s, int len, int *new_length);
-PHPAPI char *php_raw_url_encode(char const *s, int len, int *new_length);
+PHPAPI php_url *php_url_parse_ex(char const *str, zend_str_size_int length);
+PHPAPI zend_str_size_int php_url_decode(char *str, zend_str_size_int len); /* return value: length
of decoded string */
+PHPAPI zend_str_size_int php_raw_url_decode(char *str, zend_str_size_int len); /* return value:
length of decoded string */
+PHPAPI char *php_url_encode(char const *s, zend_str_size_int len, zend_str_size_int *new_length);
+PHPAPI char *php_raw_url_encode(char const *s, zend_str_size_int len, zend_str_size_int
*new_length);
PHP_FUNCTION(parse_url);
PHP_FUNCTION(urlencode);