From: Mladen Turk <mturk@apache.org>
Date: Tue, 24 Aug 2004 11:28:10 +0000 (+0000)
Subject: Use the session route from request rec notes.
X-Git-Tag: STRIKER_2_1_0_RC1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b81c4cc5e490fe49dae1b287bebfe5fda479921;p=thirdparty%2Fapache%2Fhttpd.git

Use the session route from request rec notes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104787 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
index 02704a6c264..5b5b79392b0 100644
--- a/modules/proxy/ajp_header.c
+++ b/modules/proxy/ajp_header.c
@@ -211,7 +211,7 @@ static apr_status_t ajp_marshal_into_msgb(ajp_msg_t    *msg,
     apr_byte_t is_ssl;
     char *remote_host;
     char *uri;
-    
+    const char *session_route;
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                          "Into ajp_marshal_into_msgb");
@@ -334,16 +334,16 @@ static apr_status_t ajp_marshal_into_msgb(ajp_msg_t    *msg,
             return APR_EGENERAL;
         }
     }
-/* XXXX ignored for the moment
-    if (s->jvm_route) {
+    if ((session_route = apr_table_get(r->notes, "session-route"))) {
         if (ajp_msg_append_uint8(msg, SC_A_JVM_ROUTE) ||
-            ajp_msg_append_string(msg, s->jvm_route)) {
+            ajp_msg_append_string(msg, session_route)) {
             ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                    "Error ajp_marshal_into_msgb - "
                    "Error appending the jvm route");
             return APR_EGENERAL;
         }
     }
+/* XXXX ignored for the moment
     if (s->ssl_cert_len) {
         if (ajp_msg_append_uint8(msg, SC_A_SSL_CERT) ||
             ajp_msg_append_string(msg, s->ssl_cert)) {