Commit 89561d9e authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Oh joy. Fold in backportable proxy changes/improvements 

from trunk as of r772279



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772280 13f79535-47bb-0310-9956-ffa450edef68
parent c0293d6e

modules/proxy/CHANGES

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
* PLEASE NOTE: Now that development for  *

* mod_proxy has been folded back into    *

* the httpd-2.1 tree, this file has      *

* been depreciated. Proxy changes should *

* be noted in httpd-2.1's CHANGES file.  *

* been deprecated. Proxy changes should *

* be noted in httpd-2.x's CHANGES file.  *

* This file exists for historical        *

* purposes.                              *

******************************************

modules/proxy/Makefile.in

+1 −0
Original line number Diff line number Diff line 
# a modules Makefile has no explicit targets -- they will be defined by

# whatever modules are enabled. just grab special.mk to deal with this.

#SUBDIRS = balancers

include $(top_srcdir)/build/special.mk

modules/proxy/NWGNUmakefile

+13 −10
Original line number Diff line number Diff line
@@ -160,6 +160,9 @@ TARGET_nlm = \ 
	$(OBJDIR)/proxyajp.nlm \

	$(EOLIST)



#This needs to be added to the above list once it builds for netware.

#	$(OBJDIR)/proxyfcgi.nlm \



#

# If there is an LIB target, put it here

#

modules/proxy/ajp.h

+3 −16
Original line number Diff line number Diff line
@@ -65,19 +65,6 @@ 
#define AJP13_SSL_SESSION_INDICATOR     "SSL_SESSION_ID"

#define AJP13_SSL_KEY_SIZE_INDICATOR    "SSL_CIPHER_USEKEYSIZE"



#if APR_CHARSET_EBCDIC



#define USE_CHARSET_EBCDIC

#define ajp_xlate_to_ascii(b, l) ap_xlate_proto_to_ascii(b, l)

#define ajp_xlate_from_ascii(b, l) ap_xlate_proto_from_ascii(b, l)



#else                           /* APR_CHARSET_EBCDIC */



#define ajp_xlate_to_ascii(b, l) 

#define ajp_xlate_from_ascii(b, l) 



#endif



#ifdef AJP_USE_HTTPD_WRAP

#include "httpd_wrap.h"

#else
@@ -91,7 +78,7 @@ 
#endif



#include "mod_proxy.h"



#include "util_ebcdic.h"



/** AJP Specific error codes

 */
@@ -131,10 +118,10 @@ struct ajp_msg 
    apr_size_t  len;

    /** The current read position */ 

    apr_size_t  pos;

    /** The size of the buffer */

    apr_size_t max_size;

    /** Flag indicating the origing of the message */ 

    int         server_side;

    /** The size of the buffer */

    apr_size_t max_size;

};



/**

modules/proxy/ajp_header.c

+2 −6
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static apr_status_t ajp_marshal_into_msgb(ajp_msg_t *msg, 
    ajp_msg_reset(msg);



    if (ajp_msg_append_uint8(msg, CMD_AJP13_FORWARD_REQUEST)     ||

        ajp_msg_append_uint8(msg, method)                        ||

        ajp_msg_append_uint8(msg, (apr_byte_t) method)           ||

        ajp_msg_append_string(msg, r->protocol)                  ||

        ajp_msg_append_string(msg, uri->path)                    ||

        ajp_msg_append_string(msg, r->connection->remote_ip)     ||
@@ -504,7 +504,7 @@ static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg, 


    rc = ajp_msg_get_string(msg, &ptr);

    if (rc == APR_SUCCESS) {

#if defined(AS400) || defined(_OSD_POSIX) /* EBCDIC platforms */

#if APR_CHARSET_EBCDIC /* copy only if we have to */

        ptr = apr_pstrdup(r->pool, ptr);

        ap_xlate_proto_from_ascii(ptr, strlen(ptr));

#endif
@@ -566,9 +566,7 @@ static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg, 
                       "Null header name");

                return rc;

            }

#if defined(AS400) || defined(_OSD_POSIX)

            ap_xlate_proto_from_ascii(stringname, strlen(stringname));

#endif

        }



        rc = ajp_msg_get_string(msg, &value);
@@ -593,9 +591,7 @@ static apr_status_t ajp_unmarshal_response(ajp_msg_t *msg, 
          value = ap_proxy_location_reverse_map(r, dconf, value);

        }



#if defined(AS400) || defined(_OSD_POSIX)

        ap_xlate_proto_from_ascii(value, strlen(value));

#endif

        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

               "ajp_unmarshal_response: Header[%d] [%s] = [%s]",

                       i, stringname, value);