openstack/devstack
Code Issues Proposed changes

Merge "Set specified header size when enabling tls-proxy"

Browse Source
This commit is contained in:
Jenkins 2017-06-29 23:00:35 +00:00 committed by Gerrit Code Review
commit 8f314400d8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/swift
View File

@ -842,7 +842,7 @@ function start_swift {
if is_service_enabled tls-proxy; then if is_service_enabled tls-proxy; then
local proxy_port=${SWIFT_DEFAULT_BIND_PORT} local proxy_port=${SWIFT_DEFAULT_BIND_PORT}
start_tls_proxy swift '*' $proxy_port $SERVICE_HOST $SWIFT_DEFAULT_BIND_PORT_INT start_tls_proxy swift '*' $proxy_port $SERVICE_HOST $SWIFT_DEFAULT_BIND_PORT_INT $SWIFT_MAX_HEADER_SIZE
fi fi
run_process s-proxy "$SWIFT_BIN_DIR/swift-proxy-server ${SWIFT_CONF_DIR}/proxy-server.conf -v" run_process s-proxy "$SWIFT_BIN_DIR/swift-proxy-server ${SWIFT_CONF_DIR}/proxy-server.conf -v"

7
lib/tls
View File

@ -494,6 +494,8 @@ function start_tls_proxy {
local f_port=$3 local f_port=$3
local b_host=$4 local b_host=$4
local b_port=$5 local b_port=$5
# 8190 is the default apache size.
local f_header_size=${6:-8190}
tune_apache_connections tune_apache_connections
@ -521,6 +523,11 @@ $listen_string
# ('Connection aborted.', BadStatusLine("''",)) error # ('Connection aborted.', BadStatusLine("''",)) error
KeepAlive Off KeepAlive Off
# This increase in allowed request header sizes is required
# for swift functional testing to work with tls enabled. It is 2 bytes
# larger than the apache default of 8190.
LimitRequestFieldSize $f_header_size
<Location /> <Location />
ProxyPass http://$b_host:$b_port/ retry=0 nocanon ProxyPass http://$b_host:$b_port/ retry=0 nocanon
ProxyPassReverse http://$b_host:$b_port/ ProxyPassReverse http://$b_host:$b_port/