archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.4'

Browse source 
* PHP-7.4:
  ext/soap: Compare Set-Cookie header case-insensitively
This commit is contained in:
Nikita Popov 2020-09-17 10:31:48 +02:00
commit e55a658115
1 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ext/soap/php_http.c
View file

@ -21,6 +21,7 @@
#include "ext/standard/md5.h" #include "ext/standard/md5.h"
#include "ext/standard/php_random.h" #include "ext/standard/php_random.h"
static char *get_http_header_value_nodup(char *headers, char *type, size_t *len);
static char *get_http_header_value(char *headers, char *type); static char *get_http_header_value(char *headers, char *type);
static zend_string *get_http_body(php_stream *socketd, int close, char *headers); static zend_string *get_http_body(php_stream *socketd, int close, char *headers);
static zend_string *get_http_headers(php_stream *socketd); static zend_string *get_http_headers(php_stream *socketd);
@ -348,6 +349,7 @@ int make_http_soap_request(zval *this_ptr,
int use_ssl; int use_ssl;
zend_string *http_body; zend_string *http_body;
char *content_type, *http_version, *cookie_itt; char *content_type, *http_version, *cookie_itt;
size_t cookie_len;
int http_close; int http_close;
zend_string *http_headers; zend_string *http_headers;
char *connection; char *connection;
@ -958,8 +960,9 @@ try_again:
we shouldn't be changing urls so path doesn't we shouldn't be changing urls so path doesn't
matter too much matter too much
*/ */
cookie_itt = strstr(ZSTR_VAL(http_headers), "Set-Cookie: "); cookie_itt = ZSTR_VAL(http_headers);
while (cookie_itt) {
while ((cookie_itt = get_http_header_value_nodup(cookie_itt, "Set-Cookie: ", &cookie_len))) {
char *cookie; char *cookie;
char *eqpos, *sempos; char *eqpos, *sempos;
zval *cookies; zval *cookies;
@ -971,7 +974,7 @@ try_again:
cookies = zend_hash_str_update(Z_OBJPROP_P(this_ptr), "_cookies", sizeof("_cookies")-1, &tmp_cookies); cookies = zend_hash_str_update(Z_OBJPROP_P(this_ptr), "_cookies", sizeof("_cookies")-1, &tmp_cookies);
} }
cookie = get_http_header_value(cookie_itt,"Set-Cookie: "); cookie = estrndup(cookie_itt, cookie_len);
eqpos = strstr(cookie, "="); eqpos = strstr(cookie, "=");
sempos = strstr(cookie, ";"); sempos = strstr(cookie, ";");
@ -1029,7 +1032,7 @@ try_again:
smart_str_free(&name); smart_str_free(&name);
} }
cookie_itt = strstr(cookie_itt + sizeof("Set-Cookie: "), "Set-Cookie: "); cookie_itt = cookie_itt + cookie_len;
efree(cookie); efree(cookie);
} }
@ -1347,7 +1350,7 @@ try_again:
return TRUE; return TRUE;
} }
static char *get_http_header_value(char *headers, char *type) static char *get_http_header_value_nodup(char *headers, char *type, size_t *len)
{ {
char *pos, *tmp = NULL; char *pos, *tmp = NULL;
int typelen, headerslen; int typelen, headerslen;
@ -1384,7 +1387,9 @@ static char *get_http_header_value(char *headers, char *type)
eol--; eol--;
} }
} }
return estrndup(tmp, eol - tmp);
*len = eol - tmp;
return tmp;
} }
/* find next line */ /* find next line */
@ -1398,6 +1403,20 @@ static char *get_http_header_value(char *headers, char *type)
return NULL; return NULL;
} }
static char *get_http_header_value(char *headers, char *type)
{
size_t len;
char *value;
value = get_http_header_value_nodup(headers, type, &len);
if (value) {
return estrndup(value, len);
}
return NULL;
}
static zend_string* get_http_body(php_stream *stream, int close, char *headers) static zend_string* get_http_body(php_stream *stream, int close, char *headers)
{ {
zend_string *http_buf = NULL; zend_string *http_buf = NULL;