--- httpd-2.2.11/modules/proxy/ajp_header.c	2008-11-07 01:23:17.000000000 +1300
+++ httpd-2.2.11-modified/modules/proxy/ajp_header.c	2009-01-15 16:39:44.000000000 +1300
@@ -231,7 +231,7 @@
         return AJP_EBAD_METHOD;
     }
 
-    is_ssl = (apr_byte_t) ap_proxy_conn_is_https(r->connection);
+    is_ssl = (apr_byte_t) strcmp(ap_http_scheme(r), "https") == 0;
 
     if (r->headers_in && apr_table_elts(r->headers_in)) {
         const apr_array_header_t *t = apr_table_elts(r->headers_in);
@@ -239,7 +239,11 @@
     }
 
     remote_host = (char *)ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_HOST, NULL);
-
+    
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+            "ajp_marshal_into_msgb: Virtual host = %s://%s:%u",
+            is_ssl ? "https" : "http", ap_get_server_name(r), ap_get_server_port(r));
+    
     ajp_msg_reset(msg);
 
     if (ajp_msg_append_uint8(msg, CMD_AJP13_FORWARD_REQUEST)     ||
@@ -249,7 +253,7 @@
         ajp_msg_append_string(msg, r->connection->remote_ip)     ||
         ajp_msg_append_string(msg, remote_host)                  ||
         ajp_msg_append_string(msg, ap_get_server_name(r))        ||
-        ajp_msg_append_uint16(msg, (apr_uint16_t)r->connection->local_addr->port) ||
+        ajp_msg_append_uint16(msg, (apr_uint16_t)ap_get_server_port(r)) ||
         ajp_msg_append_uint8(msg, is_ssl)                        ||
         ajp_msg_append_uint16(msg, (apr_uint16_t) num_headers)) {