pier 01/10/19 13:04:58
Modified: webapp Makefile.in
webapp/include wa.h wa_config.h wa_request.h
webapp/lib wa_config.c wa_request.c
webapp/support buildconf.sh
Log:
Preparing structures for J.F.'s big SSL patch.
Revision Changes Path
1.23 +6 -1 jakarta-tomcat-connectors/webapp/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/Makefile.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.in 2001/10/09 10:41:25 1.22
+++ Makefile.in 2001/10/19 20:04:58 1.23
@@ -56,7 +56,7 @@
# ========================================================================= #
# @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
-# @version $Id: Makefile.in,v 1.22 2001/10/09 10:41:25 jfclere Exp $
+# @version $Id: Makefile.in,v 1.23 2001/10/19 20:04:58 pier Exp $
include @TGTDIR@/Makedefs
@@ -112,6 +112,11 @@
apache-2.0-clean:
@$(MAKE) template MFLG="$(MAKEFLAGS)" MDIR="apache-2.0" MTGT="clean"
+
+apidocs-c-build:
+apidocs-c-clean:
+apidocs-java-build:
+apidocs-java-clean:
template:
@ { \
1.12 +2 -1 jakarta-tomcat-connectors/webapp/include/wa.h
Index: wa.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/include/wa.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wa.h 2001/08/06 02:18:48 1.11
+++ wa.h 2001/10/19 20:04:58 1.12
@@ -57,7 +57,7 @@
/**
* @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
- * @version $Id: wa.h,v 1.11 2001/08/06 02:18:48 pier Exp $
+ * @version $Id: wa.h,v 1.12 2001/10/19 20:04:58 pier Exp $
*/
#ifndef _WA_H_
#define _WA_H_
@@ -96,6 +96,7 @@
typedef struct wa_connection wa_connection;
typedef struct wa_request wa_request;
+typedef struct wa_ssldata wa_ssldata;
typedef struct wa_hostdata wa_hostdata;
typedef struct wa_handler wa_handler;
1.5 +5 -1 jakarta-tomcat-connectors/webapp/include/wa_config.h
Index: wa_config.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/include/wa_config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wa_config.h 2001/07/19 04:18:22 1.4
+++ wa_config.h 2001/10/19 20:04:58 1.5
@@ -58,7 +58,7 @@
/**
* @package Configuration
* @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
- * @version $Id: wa_config.h,v 1.4 2001/07/19 04:18:22 pier Exp $
+ * @version $Id: wa_config.h,v 1.5 2001/10/19 20:04:58 pier Exp $
*/
#ifndef _WA_CONFIG_H_
#define _WA_CONFIG_H_
@@ -117,6 +117,10 @@
char *rpth;
/** The local expanded application path (if any). */
char *lpth;
+ /** The list of allowed (can be served by the web server) URL-patterns. */
+ wa_chain *allw;
+ /** The list of denied (can't be served by the web server) URL-patterns. */
+ wa_chain *deny;
/** Wether this web-application has been deployed or not. */
wa_boolean depl;
};
1.7 +17 -1 jakarta-tomcat-connectors/webapp/include/wa_request.h
Index: wa_request.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/include/wa_request.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wa_request.h 2001/07/19 23:47:31 1.6
+++ wa_request.h 2001/10/19 20:04:58 1.7
@@ -58,7 +58,7 @@
/**
* @package Request Handling
* @author Pier Fumagalli <mailto:[EMAIL PROTECTED]>
- * @version $Id: wa_request.h,v 1.6 2001/07/19 23:47:31 pier Exp $
+ * @version $Id: wa_request.h,v 1.7 2001/10/19 20:04:58 pier Exp $
*/
#ifndef _WA_REQUEST_H_
#define _WA_REQUEST_H_
@@ -76,6 +76,20 @@
};
/**
+ * The SSL data structure.
+ */
+struct wa_ssldata {
+ /** The client certificate. */
+ char *cert;
+ /** The cipher algorithm. */
+ char *ciph;
+ /** The SSL session name. */
+ char *sess;
+ /** Number of bits in the key. */
+ int size;
+};
+
+/**
* The webserver request handler callback structure.
*/
struct wa_handler {
@@ -126,6 +140,8 @@
char *ctyp;
/** The number of bytes read out of this request body. */
long rlen;
+ /** The SSL data structure. */
+ wa_ssldata *ssld;
/** The current headers table. */
apr_table_t *hdrs;
};
1.7 +3 -1 jakarta-tomcat-connectors/webapp/lib/wa_config.c
Index: wa_config.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/wa_config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wa_config.c 2001/08/21 16:24:37 1.6
+++ wa_config.c 2001/10/19 20:04:58 1.7
@@ -55,7 +55,7 @@
* *
* ========================================================================= */
-/* @version $Id: wa_config.c,v 1.6 2001/08/21 16:24:37 pier Exp $ */
+/* @version $Id: wa_config.c,v 1.7 2001/10/19 20:04:58 pier Exp $ */
#include <wa.h>
/* Allocate and set up a <code>wa_application</code> member. */
@@ -92,6 +92,8 @@
appl->conn=NULL;
appl->conf=NULL;
appl->lpth=NULL;
+ appl->allw=NULL;
+ appl->deny=NULL;
appl->depl=wa_false;
/* Done */
1.16 +2 -1 jakarta-tomcat-connectors/webapp/lib/wa_request.c
Index: wa_request.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/wa_request.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wa_request.c 2001/08/06 03:07:06 1.15
+++ wa_request.c 2001/10/19 20:04:58 1.16
@@ -55,7 +55,7 @@
* *
* ========================================================================= */
-/* @version $Id: wa_request.c,v 1.15 2001/08/06 03:07:06 pier Exp $ */
+/* @version $Id: wa_request.c,v 1.16 2001/10/19 20:04:58 pier Exp $ */
#include <wa.h>
/* Allocate a new request structure. */
@@ -106,6 +106,7 @@
req->schm=NULL;
req->user=NULL;
req->auth=NULL;
+ req->ssld=NULL;
req->clen=0;
req->ctyp="\0";
req->rlen=0;
1.6 +2 -1 jakarta-tomcat-connectors/webapp/support/buildconf.sh
Index: buildconf.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/support/buildconf.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buildconf.sh 2001/10/17 18:33:31 1.5
+++ buildconf.sh 2001/10/19 20:04:58 1.6
@@ -59,7 +59,7 @@
# ------------------------------------------------------------------------- #
# Author Pier Fumagalli <[EMAIL PROTECTED]>
# Author Jon S. Stevens <mailto:[EMAIL PROTECTED]>
-# Version $Id: buildconf.sh,v 1.5 2001/10/17 18:33:31 pier Exp $
+# Version $Id: buildconf.sh,v 1.6 2001/10/19 20:04:58 pier Exp $
# ------------------------------------------------------------------------- #
if [ ! -f ./configure.in ]
@@ -84,5 +84,6 @@
echo "option \"--with-apr=[path to APR sources]\""
fi
echo "--- Creating WebApp \"configure\" script"
+echo "Creating configure ..."
autoconf
echo "--- All done"
