[patch] Fix for mod_proxy_ajp's SSL attributes

ajp_header.diff (text/plain), 4.63 KB, created by william.barker on 2005-10-07 17:02:45 UTC

(hide)

Description: Fix for mod_proxy_ajp's SSL attributes

Filename:

MIME Type:

Creator: william.barker

Created: 2005-10-07 17:02:45 UTC

Size: 4.63 KB

patch

obsolete

>Index: ajp_header.c >=================================================================== >--- ajp_header.c (revision 307133) >+++ ajp_header.c (working copy) >@@ -341,55 +341,61 @@ > * SetEnv SSL_SESSION_ID CUSTOM_SSL_SESSION_ID > * </Location> > */ >- if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r, >- AJP13_SSL_CLIENT_CERT_INDICATOR))) { >- if (ajp_msg_append_uint8(msg, SC_A_SSL_CERT) || >- ajp_msg_append_string(msg, envvar)) { >- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, >- "ajp_marshal_into_msgb: " >- "Error appending the SSL certificates"); >- return AJP_EOVERFLOW; >+ if(is_ssl) { >+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r, >+ AJP13_SSL_CLIENT_CERT_INDICATOR)) && >+ envvar[0]) { >+ if (ajp_msg_append_uint8(msg, SC_A_SSL_CERT) || >+ ajp_msg_append_string(msg, envvar)) { >+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, >+ "ajp_marshal_into_msgb: " >+ "Error appending the SSL certificates"); >+ return AJP_EOVERFLOW; >+ } > } >- } > >- if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r, >- AJP13_SSL_CIPHER_INDICATOR))) { >- if (ajp_msg_append_uint8(msg, SC_A_SSL_CIPHER) || >- ajp_msg_append_string(msg, envvar)) { >- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, >- "ajp_marshal_into_msgb: " >- "Error appending the SSL ciphers"); >- return AJP_EOVERFLOW; >+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r, >+ AJP13_SSL_CIPHER_INDICATOR)) && >+ envvar[0]) { >+ if (ajp_msg_append_uint8(msg, SC_A_SSL_CIPHER) || >+ ajp_msg_append_string(msg, envvar)) { >+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, >+ "ajp_marshal_into_msgb: " >+ "Error appending the SSL ciphers"); >+ return AJP_EOVERFLOW; >+ } > } >- } > >- if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r, >- AJP13_SSL_SESSION_INDICATOR))) { >- if (ajp_msg_append_uint8(msg, SC_A_SSL_SESSION) || >- ajp_msg_append_string(msg, envvar)) { >- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, >- "ajp_marshal_into_msgb: " >- "Error appending the SSL session"); >- return AJP_EOVERFLOW; >+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r, >+ AJP13_SSL_SESSION_INDICATOR)) && >+ envvar[0]) { >+ if (ajp_msg_append_uint8(msg, SC_A_SSL_SESSION) || >+ ajp_msg_append_string(msg, envvar)) { >+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, >+ "ajp_marshal_into_msgb: " >+ "Error appending the SSL session"); >+ return AJP_EOVERFLOW; >+ } > } >- } > >- /* >- * ssl_key_size is required by Servlet 2.3 API >- * added support only in ajp14 mode >- * JFC removed: ae->proto == AJP14_PROTO >- */ >- /* XXXX ignored for the moment >- if (s->ssl_key_size != -1) { >- if (ajp_msg_append_uint8(msg, SC_A_SSL_KEY_SIZE) || >- ajp_msg_append_uint16(msg, (unsigned short) s->ssl_key_size)) { >- ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, >- "Error ajp_marshal_into_msgb - " >- "Error appending the SSL key size"); >- return APR_EGENERAL; >+ /* >+ * ssl_key_size is required by Servlet 2.3 API >+ * added support only in ajp14 mode >+ * JFC removed: ae->proto == AJP14_PROTO >+ */ >+ if ((envvar = ap_proxy_ssl_val(r->pool, r->server, r->connection, r, >+ AJP13_SSL_KEY_SIZE_INDICATOR)) && >+ envvar[0]) { >+ >+ if (ajp_msg_append_uint8(msg, SC_A_SSL_KEY_SIZE) || >+ ajp_msg_append_uint16(msg, (unsigned short) atoi(envvar))) { >+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, >+ "Error ajp_marshal_into_msgb - " >+ "Error appending the SSL key size"); >+ return APR_EGENERAL; >+ } > } > } >- */ > /* Use the environment vars prefixed with AJP_ > * and pass it to the header striping that prefix. > */ View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]