tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/connectors/lib wa_request.c
Date Thu, 10 May 2001 06:25:29 GMT
pier        01/05/09 23:25:29

  Modified:    connectors/lib wa_request.c
  Log:
  Updated request handling mechanism and function names/prototypes.
  
  Revision  Changes    Path
  1.5       +179 -50   jakarta-tomcat-4.0/connectors/lib/wa_request.c
  
  Index: wa_request.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/lib/wa_request.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- wa_request.c	2001/04/25 17:05:52	1.4
  +++ wa_request.c	2001/05/10 06:25:27	1.5
  @@ -55,57 +55,186 @@
    *                                                                           *
    * ========================================================================= */
   
  -/* @version $Id: wa_request.c,v 1.4 2001/04/25 17:05:52 pier Exp $ */
  +/* @version $Id: wa_request.c,v 1.5 2001/05/10 06:25:27 pier Exp $ */
   #include <wa.h>
   
   /* Allocate a new request structure. */
  -const char *WA_AllocRequest(wa_request **r, void *d) {
  -	apr_pool_t *pool=NULL;
  -	wa_request *req=NULL;
  -	
  -	if(apr_pool_create(&pool,WA_Pool)!=APR_SUCCESS)
  -		return("Cannot create request memory pool");
  -	if((req=apr_palloc(pool,sizeof(wa_request)))==NULL) {
  -		apr_pool_destroy(pool);
  -		return("Cannot allocate memory for the request structure");
  -	}
  -
  -	/* Set up the server host data record */
  -	if((req->serv=apr_palloc(pool,sizeof(wa_hostdata)))==NULL) {
  -		apr_pool_destroy(pool);
  -		return("Cannot allocate memory for server host data structure");
  -	} else {
  -		req->serv->host=NULL;
  -		req->serv->addr=NULL;
  -		req->serv->port=-1;
  -	}
  -
  -	/* Set up the server host data record */
  -	if((req->clnt=apr_palloc(pool,sizeof(wa_hostdata)))==NULL) {
  -		apr_pool_destroy(pool);
  -		return("Cannot allocate memory for client host data structure");
  -	} else {
  -		req->clnt->host=NULL;
  -		req->clnt->addr=NULL;
  -		req->clnt->port=-1;
  -	}
  -
  -	/* Set up the headers table */
  -//	req->hdrs=NULL;
  -
  -	/* Set up all other request members */
  -	req->pool=pool;
  -	req->data=d;
  -	req->meth=NULL;
  -	req->ruri=NULL;
  -	req->args=NULL;
  -	req->prot=NULL;
  -	req->schm=NULL;
  -	req->user=NULL;
  -	req->auth=NULL;
  -	req->clen=0;
  -	req->rlen=0;
  -	
  -	/* All done */
  -	return(NULL);
  +const char *wa_ralloc(wa_request **r, wa_handler *h, void *d) {
  +    apr_pool_t *pool=NULL;
  +    wa_request *req=NULL;
  +
  +    if(apr_pool_create(&pool,wa_pool)!=APR_SUCCESS)
  +        return("Cannot create request memory pool");
  +    if((req=apr_palloc(pool,sizeof(wa_request)))==NULL) {
  +        apr_pool_destroy(pool);
  +        return("Cannot allocate memory for the request structure");
  +    }
  +
  +    if (h==NULL) return("Invalid request handler specified");
  +
  +    /* Set up the server host data record */
  +    if((req->serv=apr_palloc(pool,sizeof(wa_hostdata)))==NULL) {
  +        apr_pool_destroy(pool);
  +        return("Cannot allocate memory for server host data structure");
  +    } else {
  +        req->serv->host=NULL;
  +        req->serv->addr=NULL;
  +        req->serv->port=-1;
  +    }
  +
  +    /* Set up the server host data record */
  +    if((req->clnt=apr_palloc(pool,sizeof(wa_hostdata)))==NULL) {
  +        apr_pool_destroy(pool);
  +        return("Cannot allocate memory for client host data structure");
  +    } else {
  +        req->clnt->host=NULL;
  +        req->clnt->addr=NULL;
  +        req->clnt->port=-1;
  +    }
  +
  +    /* Set up the headers table */
  +    req->hdrs=apr_table_make(pool,0);
  +
  +    /* Set up all other request members */
  +    req->pool=pool;
  +    req->hand=h;
  +    req->data=d;
  +    req->meth=NULL;
  +    req->ruri=NULL;
  +    req->args=NULL;
  +    req->prot=NULL;
  +    req->schm=NULL;
  +    req->user=NULL;
  +    req->auth=NULL;
  +    req->clen=0;
  +    req->rlen=0;
  +
  +    /* All done */
  +    *r=req;
  +    return(NULL);
  +}
  +
  +/* Clean up and free the memory used by a request structure. */
  +const char *wa_rfree(wa_request *r) {
  +    if (r==NULL) return("Invalid request member");
  +    apr_pool_destroy(r->pool);
  +    return(NULL);
  +}
  +
  +
  +int wa_rerror_headers(void *d, const char *key, const char *val) {
  +    wa_request *r=(wa_request *)d;
  +
  +    wa_rprintf(r,"   <DD>%s: %s</DD>\n",key,val);
  +    return(TRUE);
  +}
  +
  +/* Dump an error response */
  +int wa_rerror(wa_request *r, int s, const char *fmt, ...) {
  +    va_list ap;
  +    char buf[1024];
  +
  +    va_start(ap,fmt);
  +    vsnprintf(buf,1024,fmt,ap);
  +    va_end(ap);
  +
  +    r->hand->log(r,WA_MARK,buf);
  +
  +    wa_rsetstatus(r,s);
  +    wa_rsetctype(r,"text/html");
  +    wa_rcommit(r);
  +
  +    wa_rprintf(r,"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2 Final//EN\">");
  +    wa_rprintf(r,"<HTML>\n");
  +    wa_rprintf(r," <HEAD>\n");
  +    wa_rprintf(r,"  <TITLE>WebApp: %d Error</TITLE",s);
  +    wa_rprintf(r," </HEAD>\n");
  +    wa_rprintf(r," <BODY>\n");
  +    wa_rprintf(r,"  <DIV ALIGN=\"CENTER\">");
  +    wa_rprintf(r,"    <H1>WebApp: %d Error</H1>",s);
  +    wa_rprintf(r,"  </DIV>\n");
  +    wa_rprintf(r,"  <HR>\n");
  +    wa_rprintf(r,"  %s\n",buf);
  +    wa_rprintf(r,"  <HR>\n");
  +    wa_rprintf(r,"  <DL>\n");
  +    wa_rprintf(r,"   <DT>Your Request:</DT>\n");
  +    wa_rprintf(r,"   <DD>Server Host: \"%s\"</DD>\n",r->serv->host);
  +    wa_rprintf(r,"   <DD>Server Address: \"%s\"</DD>\n",r->serv->addr);
  +    wa_rprintf(r,"   <DD>Server Port: \"%d\"</DD>\n",r->serv->port);
  +    wa_rprintf(r,"   <DD>Client Host: \"%s\"</DD>\n",r->clnt->host);
  +    wa_rprintf(r,"   <DD>Client Address: \"%s\"</DD>\n",r->clnt->addr);
  +    wa_rprintf(r,"   <DD>Client Port: \"%d\"</DD>\n",r->clnt->port);
  +    wa_rprintf(r,"   <DD>Request Method: \"%s\"</DD>\n",r->meth);
  +    wa_rprintf(r,"   <DD>Request URI: \"%s\"</DD>\n",r->ruri);
  +    wa_rprintf(r,"   <DD>Request Arguments: \"%s\"</DD>\n",r->args);
  +    wa_rprintf(r,"   <DD>Request Protocol: \"%s\"</DD>\n",r->prot);
  +    wa_rprintf(r,"   <DD>Request Scheme: \"%s\"</DD>\n",r->schm);
  +    wa_rprintf(r,"   <DD>Request User: \"%s\"</DD>\n",r->user);
  +    wa_rprintf(r,"   <DD>Request Authentication Mech.: \"%s\"</DD>\n",r->auth);
  +    wa_rprintf(r,"   <DD>Request Content-Length: \"%d\"</DD>\n",r->clen);
  +    wa_rprintf(r,"   <DT>Your Headers:</DT>\n");
  +    apr_table_do(wa_rerror_headers,r,r->hdrs,NULL);
  +    wa_rprintf(r,"  </DL>\n");
  +    wa_rprintf(r,"  <HR>\n");
  +    wa_rprintf(r," </BODY>\n");
  +    wa_rprintf(r,"</HTML>\n");
  +    wa_rflush(r);
  +
  +    return(s);
  +}
  +
  +/* Invoke a request in a web application. */
  +int wa_rinvoke(wa_request *r, wa_application *a) {
  +    return(a->conn->prov->handle(r,a));
  +}
  +
  +void wa_rlog(wa_request *r, const char *f, const int l, const char *fmt, ...) {
  +    va_list ap;
  +    char buf[1024];
  +
  +    va_start(ap,fmt);
  +    vsnprintf(buf,1024,fmt,ap);
  +    va_end(ap);
  +
  +    r->hand->log(r,f,l,buf);
  +}
  +
  +void wa_rsetstatus(wa_request *r, int status) {
  +    r->hand->setstatus(r,status);
  +}
  +
  +void wa_rsetctype(wa_request *r, char *type) {
  +    r->hand->setctype(r,type);
  +}
  +
  +void wa_rsetheader(wa_request *r, char *name, char *value) {
  +    r->hand->setheader(r,name,value);
  +}
  +
  +void wa_rcommit(wa_request *r) {
  +    r->hand->commit(r);
  +}
  +
  +void wa_rflush(wa_request *r) {
  +    r->hand->flush(r);
  +}
  +
  +int wa_rread(wa_request *r, char *buf, int len) {
  +    return(r->hand->read(r,buf,len));
  +}
  +
  +int wa_rwrite(wa_request *r, char *buf, int len) {
  +    return(r->hand->write(r,buf,len));
  +}
  +
  +int wa_rprintf(wa_request *r, const char *fmt, ...) {
  +    va_list ap;
  +    char buf[1024];
  +    int ret=0;
  +
  +    va_start(ap,fmt);
  +    ret=vsnprintf(buf,1024,fmt,ap);
  +    va_end(ap);
  +
  +    return(r->hand->write(r,buf,ret));
   }
  
  
  

Mime
View raw message