mirror of
https://github.com/php/php-src.git
synced 2024-09-23 19:07:26 +00:00
60a69daec6
This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
273 lines
7.7 KiB
C
273 lines
7.7 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| PHP Version 7 |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 1997-2018 The PHP Group |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Sara Golemon <pollita@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
/* $Id$ */
|
|
|
|
#include "php_http.h"
|
|
#include "php_ini.h"
|
|
#include "url.h"
|
|
|
|
#define URL_DEFAULT_ARG_SEP "&"
|
|
|
|
/* {{{ php_url_encode_hash */
|
|
PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
|
|
const char *num_prefix, size_t num_prefix_len,
|
|
const char *key_prefix, size_t key_prefix_len,
|
|
const char *key_suffix, size_t key_suffix_len,
|
|
zval *type, char *arg_sep, int enc_type)
|
|
{
|
|
zend_string *key = NULL;
|
|
char *newprefix, *p;
|
|
const char *prop_name;
|
|
size_t arg_sep_len, newprefix_len, prop_len;
|
|
zend_ulong idx;
|
|
zval *zdata = NULL;
|
|
|
|
if (!ht) {
|
|
return FAILURE;
|
|
}
|
|
|
|
if (ht->u.v.nApplyCount > 0) {
|
|
/* Prevent recursion */
|
|
return SUCCESS;
|
|
}
|
|
|
|
if (!arg_sep) {
|
|
arg_sep = INI_STR("arg_separator.output");
|
|
if (!arg_sep || !strlen(arg_sep)) {
|
|
arg_sep = URL_DEFAULT_ARG_SEP;
|
|
}
|
|
}
|
|
arg_sep_len = strlen(arg_sep);
|
|
|
|
ZEND_HASH_FOREACH_KEY_VAL_IND(ht, idx, key, zdata) {
|
|
/* handling for private & protected object properties */
|
|
if (key) {
|
|
if (ZSTR_VAL(key)[0] == '\0' && type != NULL) {
|
|
const char *tmp;
|
|
|
|
zend_object *zobj = Z_OBJ_P(type);
|
|
if (zend_check_property_access(zobj, key) != SUCCESS) {
|
|
/* private or protected property access outside of the class */
|
|
continue;
|
|
}
|
|
zend_unmangle_property_name_ex(key, &tmp, &prop_name, &prop_len);
|
|
} else {
|
|
prop_name = ZSTR_VAL(key);
|
|
prop_len = ZSTR_LEN(key);
|
|
}
|
|
} else {
|
|
prop_name = NULL;
|
|
prop_len = 0;
|
|
}
|
|
|
|
ZVAL_DEREF(zdata);
|
|
if (Z_TYPE_P(zdata) == IS_ARRAY || Z_TYPE_P(zdata) == IS_OBJECT) {
|
|
if (key) {
|
|
zend_string *ekey;
|
|
if (enc_type == PHP_QUERY_RFC3986) {
|
|
ekey = php_raw_url_encode(prop_name, prop_len);
|
|
} else {
|
|
ekey = php_url_encode(prop_name, prop_len);
|
|
}
|
|
newprefix_len = key_suffix_len + ZSTR_LEN(ekey) + key_prefix_len + 3 /* %5B */;
|
|
newprefix = emalloc(newprefix_len + 1);
|
|
p = newprefix;
|
|
|
|
if (key_prefix) {
|
|
memcpy(p, key_prefix, key_prefix_len);
|
|
p += key_prefix_len;
|
|
}
|
|
|
|
memcpy(p, ZSTR_VAL(ekey), ZSTR_LEN(ekey));
|
|
p += ZSTR_LEN(ekey);
|
|
zend_string_free(ekey);
|
|
|
|
if (key_suffix) {
|
|
memcpy(p, key_suffix, key_suffix_len);
|
|
p += key_suffix_len;
|
|
}
|
|
*(p++) = '%';
|
|
*(p++) = '5';
|
|
*(p++) = 'B';
|
|
*p = '\0';
|
|
} else {
|
|
char *ekey;
|
|
size_t ekey_len;
|
|
/* Is an integer key */
|
|
ekey_len = spprintf(&ekey, 0, ZEND_LONG_FMT, idx);
|
|
newprefix_len = key_prefix_len + num_prefix_len + ekey_len + key_suffix_len + 3 /* %5B */;
|
|
newprefix = emalloc(newprefix_len + 1);
|
|
p = newprefix;
|
|
|
|
if (key_prefix) {
|
|
memcpy(p, key_prefix, key_prefix_len);
|
|
p += key_prefix_len;
|
|
}
|
|
|
|
memcpy(p, num_prefix, num_prefix_len);
|
|
p += num_prefix_len;
|
|
|
|
memcpy(p, ekey, ekey_len);
|
|
p += ekey_len;
|
|
efree(ekey);
|
|
|
|
if (key_suffix) {
|
|
memcpy(p, key_suffix, key_suffix_len);
|
|
p += key_suffix_len;
|
|
}
|
|
*(p++) = '%';
|
|
*(p++) = '5';
|
|
*(p++) = 'B';
|
|
*p = '\0';
|
|
}
|
|
if (ZEND_HASH_APPLY_PROTECTION(ht)) {
|
|
ht->u.v.nApplyCount++;
|
|
}
|
|
php_url_encode_hash_ex(HASH_OF(zdata), formstr, NULL, 0, newprefix, newprefix_len, "%5D", 3, (Z_TYPE_P(zdata) == IS_OBJECT ? zdata : NULL), arg_sep, enc_type);
|
|
if (ZEND_HASH_APPLY_PROTECTION(ht)) {
|
|
ht->u.v.nApplyCount--;
|
|
}
|
|
efree(newprefix);
|
|
} else if (Z_TYPE_P(zdata) == IS_NULL || Z_TYPE_P(zdata) == IS_RESOURCE) {
|
|
/* Skip these types */
|
|
continue;
|
|
} else {
|
|
if (formstr->s) {
|
|
smart_str_appendl(formstr, arg_sep, arg_sep_len);
|
|
}
|
|
/* Simple key=value */
|
|
smart_str_appendl(formstr, key_prefix, key_prefix_len);
|
|
if (key) {
|
|
zend_string *ekey;
|
|
if (enc_type == PHP_QUERY_RFC3986) {
|
|
ekey = php_raw_url_encode(prop_name, prop_len);
|
|
} else {
|
|
ekey = php_url_encode(prop_name, prop_len);
|
|
}
|
|
smart_str_append(formstr, ekey);
|
|
zend_string_free(ekey);
|
|
} else {
|
|
/* Numeric key */
|
|
if (num_prefix) {
|
|
smart_str_appendl(formstr, num_prefix, num_prefix_len);
|
|
}
|
|
smart_str_append_long(formstr, idx);
|
|
}
|
|
smart_str_appendl(formstr, key_suffix, key_suffix_len);
|
|
smart_str_appendl(formstr, "=", 1);
|
|
switch (Z_TYPE_P(zdata)) {
|
|
case IS_STRING: {
|
|
zend_string *ekey;
|
|
if (enc_type == PHP_QUERY_RFC3986) {
|
|
ekey = php_raw_url_encode(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata));
|
|
} else {
|
|
ekey = php_url_encode(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata));
|
|
}
|
|
smart_str_append(formstr, ekey);
|
|
zend_string_free(ekey);
|
|
}
|
|
break;
|
|
case IS_LONG:
|
|
smart_str_append_long(formstr, Z_LVAL_P(zdata));
|
|
break;
|
|
case IS_FALSE:
|
|
smart_str_appendl(formstr, "0", sizeof("0")-1);
|
|
break;
|
|
case IS_TRUE:
|
|
smart_str_appendl(formstr, "1", sizeof("1")-1);
|
|
break;
|
|
case IS_DOUBLE:
|
|
{
|
|
char *ekey;
|
|
size_t ekey_len;
|
|
ekey_len = spprintf(&ekey, 0, "%.*G", (int) EG(precision), Z_DVAL_P(zdata));
|
|
smart_str_appendl(formstr, ekey, ekey_len);
|
|
efree(ekey);
|
|
}
|
|
break;
|
|
default:
|
|
{
|
|
zend_string *ekey;
|
|
zend_string *tmp = zval_get_string(zdata);
|
|
if (enc_type == PHP_QUERY_RFC3986) {
|
|
ekey = php_raw_url_encode(ZSTR_VAL(tmp), ZSTR_LEN(tmp));
|
|
} else {
|
|
ekey = php_url_encode(ZSTR_VAL(tmp), ZSTR_LEN(tmp));
|
|
}
|
|
smart_str_append(formstr, ekey);
|
|
zend_string_release(tmp);
|
|
zend_string_free(ekey);
|
|
}
|
|
}
|
|
}
|
|
} ZEND_HASH_FOREACH_END();
|
|
|
|
return SUCCESS;
|
|
}
|
|
/* }}} */
|
|
|
|
/* {{{ proto string http_build_query(mixed formdata [, string prefix [, string arg_separator [, int enc_type]]])
|
|
Generates a form-encoded query string from an associative array or object. */
|
|
PHP_FUNCTION(http_build_query)
|
|
{
|
|
zval *formdata;
|
|
char *prefix = NULL, *arg_sep=NULL;
|
|
size_t arg_sep_len = 0, prefix_len = 0;
|
|
smart_str formstr = {0};
|
|
zend_long enc_type = PHP_QUERY_RFC1738;
|
|
|
|
ZEND_PARSE_PARAMETERS_START(1, 4)
|
|
Z_PARAM_ZVAL(formdata)
|
|
Z_PARAM_OPTIONAL
|
|
Z_PARAM_STRING(prefix, prefix_len)
|
|
Z_PARAM_STRING(arg_sep, arg_sep_len)
|
|
Z_PARAM_LONG(enc_type)
|
|
ZEND_PARSE_PARAMETERS_END_EX(RETURN_FALSE);
|
|
|
|
if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) {
|
|
php_error_docref(NULL, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given");
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
if (php_url_encode_hash_ex(HASH_OF(formdata), &formstr, prefix, prefix_len, NULL, 0, NULL, 0, (Z_TYPE_P(formdata) == IS_OBJECT ? formdata : NULL), arg_sep, (int)enc_type) == FAILURE) {
|
|
if (formstr.s) {
|
|
smart_str_free(&formstr);
|
|
}
|
|
RETURN_FALSE;
|
|
}
|
|
|
|
if (!formstr.s) {
|
|
RETURN_EMPTY_STRING();
|
|
}
|
|
|
|
smart_str_0(&formstr);
|
|
|
|
RETURN_NEW_STR(formstr.s);
|
|
}
|
|
/* }}} */
|
|
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
* c-basic-offset: 4
|
|
* End:
|
|
* vim600: sw=4 ts=4 fdm=marker
|
|
* vim<600: sw=4 ts=4
|
|
*/
|