Alex Lourie has uploaded a new change for review.

Change subject: packaging: setup: updated early statement for /api
......................................................................

packaging: setup: updated early statement for /api

The current proxy configuration removes Expect
headers incorrectly:

1) The 'early' statement removed by the commit
4acbcb524 is still required.

2) According to mod_headers documentation at [1],
the directive cannot be used as nested in <Location>:

"Because early directives are processed before the request
path's configuration is traversed, early headers can only
be set in a main server or virtual host context.
 Early directives cannot depend on a request path, so they
will fail in contexts such as <Directory> or <Location>"

The new implementation brings back the 'early' directive and
relocates the statement into main context.

[1] http://httpd.apache.org/docs/current/mod/mod_headers.html

Change-Id: I4dda234b7669dcd6c6eb76728a8536ba49247393
Bug-Url: https://bugzilla.redhat.com/849442
Related-To: https://bugzilla.redhat.com/979737
Signed-off-by: Alex Lourie <[email protected]>
---
M packaging/conf/ovirt-engine-proxy.conf.v2.in
1 file changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/16882/1

diff --git a/packaging/conf/ovirt-engine-proxy.conf.v2.in 
b/packaging/conf/ovirt-engine-proxy.conf.v2.in
index 7c63482..ba28b64 100644
--- a/packaging/conf/ovirt-engine-proxy.conf.v2.in
+++ b/packaging/conf/ovirt-engine-proxy.conf.v2.in
@@ -6,6 +6,14 @@
 #
 <IfModule proxy_ajp_module>
 
+    #
+    # Remove the Expect headers from API requests (this is needed to fix a
+    # problem with some API clients):
+    #
+    <IfModule headers_module>
+        RequestHeader unset Expect early
+    </IfModule>
+
     <Proxy ajp://localhost:@JBOSS_AJP_PORT@>
         # This is needed to make sure that connections to the application 
server
         # are recovered in a short time interval (5 seconds at the moment)
@@ -34,14 +42,6 @@
 
     <Location /api>
         ProxyPass ajp://localhost:@JBOSS_AJP_PORT@/api
-
-        #
-        # Remove the Expect headers from API requests (this is needed to fix a
-        # problem with some API clients):
-        #
-        <IfModule headers_module>
-            RequestHeader unset Expect
-        </IfModule>
 
         <IfModule deflate_module>
             AddOutputFilterByType DEFLATE text/javascript text/css text/html 
text/xml text/json application/xml application/json application/x-yaml


-- 
To view, visit http://gerrit.ovirt.org/16882
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dda234b7669dcd6c6eb76728a8536ba49247393
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alex Lourie <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to