|
 |
ad4e62 |
# ./pullrev.sh 1847288
|
|
|
ad4e62 |
http://svn.apache.org/viewvc?view=revision&revision=1847288
|
|
|
ad4e62 |
|
|
|
ad4e62 |
https://bugzilla.redhat.com/show_bug.cgi?id=1725922
|
|
|
ad4e62 |
|
|
|
ad4e62 |
--- httpd-2.4.25/modules/session/mod_session_cookie.c
|
|
|
ad4e62 |
+++ httpd-2.4.25/modules/session/mod_session_cookie.c
|
|
|
ad4e62 |
@@ -67,7 +67,7 @@
|
|
|
ad4e62 |
if (conf->name_set) {
|
|
|
ad4e62 |
if (z->encoded && z->encoded[0]) {
|
|
|
ad4e62 |
ap_cookie_write(r, conf->name, z->encoded, conf->name_attrs,
|
|
|
ad4e62 |
- z->maxage, r->headers_out, r->err_headers_out,
|
|
|
ad4e62 |
+ z->maxage, r->err_headers_out,
|
|
|
ad4e62 |
NULL);
|
|
|
ad4e62 |
}
|
|
|
ad4e62 |
else {
|
|
|
ad4e62 |
@@ -80,7 +80,7 @@
|
|
|
ad4e62 |
if (conf->name2_set) {
|
|
|
ad4e62 |
if (z->encoded && z->encoded[0]) {
|
|
|
ad4e62 |
ap_cookie_write2(r, conf->name2, z->encoded, conf->name2_attrs,
|
|
|
ad4e62 |
- z->maxage, r->headers_out, r->err_headers_out,
|
|
|
ad4e62 |
+ z->maxage, r->err_headers_out,
|
|
|
ad4e62 |
NULL);
|
|
|
ad4e62 |
}
|
|
|
ad4e62 |
else {
|
|
|
ad4e62 |
diff --git a/modules/session/mod_session_cookie.c b/modules/session/mod_session_cookie.c
|
|
|
ad4e62 |
index a010ee7..fee7c36 100644
|
|
|
ad4e62 |
--- a/modules/session/mod_session_cookie.c
|
|
|
ad4e62 |
+++ b/modules/session/mod_session_cookie.c
|
|
|
ad4e62 |
@@ -71,7 +71,7 @@ static apr_status_t session_cookie_save(request_rec * r, session_rec * z)
|
|
|
ad4e62 |
NULL);
|
|
|
ad4e62 |
}
|
|
|
ad4e62 |
else {
|
|
|
ad4e62 |
- ap_cookie_remove(r, conf->name, conf->name_attrs, r->headers_out,
|
|
|
ad4e62 |
+ ap_cookie_remove(r, conf->name, conf->name_attrs,
|
|
|
ad4e62 |
r->err_headers_out, NULL);
|
|
|
ad4e62 |
}
|
|
|
ad4e62 |
}
|
|
|
ad4e62 |
@@ -85,7 +85,7 @@ static apr_status_t session_cookie_save(request_rec * r, session_rec * z)
|
|
|
ad4e62 |
}
|
|
|
ad4e62 |
else {
|
|
|
ad4e62 |
ap_cookie_remove2(r, conf->name2, conf->name2_attrs,
|
|
|
ad4e62 |
- r->headers_out, r->err_headers_out, NULL);
|
|
|
ad4e62 |
+ r->err_headers_out, NULL);
|
|
|
ad4e62 |
}
|
|
|
ad4e62 |
}
|
|
|
ad4e62 |
|