hgomez 2004/07/29 01:04:49
Modified: ajp/ajplib/test ajp.h ajp_logon.c
Log:
Fix logon phase
Revision Changes Path
1.15 +2 -0 jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h
Index: ajp.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ajp.h 29 Jul 2004 07:56:32 -0000 1.14
+++ ajp.h 29 Jul 2004 08:04:49 -0000 1.15
@@ -84,6 +84,8 @@
#define AJP_EBAD_HEADER (APR_OS_START_USERERR + 7)
/** Bad message */
#define AJP_EBAD_MESSAGE (APR_OS_START_USERERR + 8)
+/** Cant log via AJP14 */
+#define AJP_ELOGFAIL (APR_OS_START_USERERR + 9)
/** A structure that represents ajp message */
typedef struct ajp_msg ajp_msg_t;
1.2 +6 -8 jakarta-tomcat-connectors/ajp/ajplib/test/ajp_logon.c
Index: ajp_logon.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/ajp_logon.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ajp_logon.c 29 Jul 2004 07:59:37 -0000 1.1
+++ ajp_logon.c 29 Jul 2004 08:04:49 -0000 1.2
@@ -77,7 +77,7 @@
* @param servername local server name (ie: Apache 2.0.50)
* @return APR_SUCCESS or error
*/
-apr_status_t ajp_handle_login(ajp_msg *msg, char *secret, char *servername)
+apr_status_t ajp_handle_login(ajp_msg_t *msg, char *secret, char *servername)
{
int status;
char *entropy;
@@ -92,13 +92,13 @@
return AJP_ELOGFAIL;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
"ajp_handle_login(): received entropy %s",
entropy);
comp_md5(entropy, secret, computedKey);
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
"ajp_handle_login(): computed md5 (%s/%s) -> (%s)",
entropy, secret, computedKey);
@@ -155,7 +155,7 @@
* @param msg AJP Message to be decoded
* @return APR_SUCCESS or error
*/
-apr_status ajp_handle_logok(ajp_msg_t *msg)
+apr_status_t ajp_handle_logok(ajp_msg_t *msg)
{
apr_status_t status;
apr_uint32_t negociation;
@@ -163,8 +163,6 @@
status = ajp_msg_get_uint32(msg, &negociation);
- nego = msg->getLong(env, msg);
-
if (status != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, NULL,
"ajp_handle_logok(): can't get negociation header");
@@ -181,7 +179,7 @@
return AJP_ELOGFAIL;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
"ajp_handle_logok(): Successfully logged to %s",
server_name);
@@ -208,7 +206,7 @@
return AJP_ELOGFAIL;
}
- ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
"ajp_handle_logok(): logon failure code is %08lx",
(long)failurecode);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
