cvs commit: jakarta-tomcat-connectors/webapp/lib wa_request.c

[jfclere]

jfclere 02/01/09 03:26:08

  Modified:webapp/lib wa_request.c
  Log:
  Call wa_startup() if the application is not deployed.
  The problem was when starting Apache before Tomcat.
  Submitted by: Martin van den Bemt, [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.17  +11 -3 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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- wa_request.c  19 Oct 2001 20:04:58 -  1.16
  +++ wa_request.c  9 Jan 2002 11:26:08 -   1.17
  @@ -55,7 +55,7 @@
*   *
* = */
   
  -/* @version $Id: wa_request.c,v 1.16 2001/10/19 20:04:58 pier Exp $ */
  +/* @version $Id: wa_request.c,v 1.17 2002/01/09 11:26:08 jfclere Exp $ */
   #include wa.h
   
   /* Allocate a new request structure. */
  @@ -194,8 +194,16 @@
   
   /* Invoke a request in a web application. */
   int wa_rinvoke(wa_request *r, wa_application *a) {
  -if (a-depl!=wa_true)
  -return(wa_rerror(WA_MARK,r,404,Web-application not yet deployed));
  +/*
  + * If the application is not yet deployed that could be because
  + * Apache was started before Tomcat.
  + */
  +if (a-depl!=wa_true) {
  +wa_log(WA_MARK, Re-Trying to deploy connections);
  +wa_startup();
  +if (a-depl!=wa_true)
  +return(wa_rerror(WA_MARK,r,404,Web-application not yet deployed));
  +}
   return(a-conn-prov-handle(r,a));
   }
   
  
  
  

--
To unsubscribe, e-mail:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/webapp/lib wa_request.c

[pier]

pier01/07/19 16:50:48

  Modified:webapp/lib wa_request.c
  Log:
  Set default content-type string.
  
  Revision  ChangesPath
  1.14  +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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- wa_request.c  2001/07/19 04:21:38 1.13
  +++ wa_request.c  2001/07/19 23:50:47 1.14
  @@ -55,7 +55,7 @@
*   *
* = */
   
  -/* @version $Id: wa_request.c,v 1.13 2001/07/19 04:21:38 pier Exp $ */
  +/* @version $Id: wa_request.c,v 1.14 2001/07/19 23:50:47 pier Exp $ */
   #include wa.h
   
   /* Allocate a new request structure. */
  @@ -107,6 +107,7 @@
   req-user=NULL;
   req-auth=NULL;
   req-clen=0;
  +req-ctyp=\0;
   req-rlen=0;
   
   /* All done */
  
  
  

cvs commit: jakarta-tomcat-connectors/webapp/lib wa_request.c wa_config.c

[pier]

pier01/07/18 21:21:38

  Modified:webapp/lib wa_request.c wa_config.c
  Log:
  Handle the deployed flag at library level.
  
  Revision  ChangesPath
  1.13  +3 -2  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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- wa_request.c  2001/07/15 08:39:58 1.12
  +++ wa_request.c  2001/07/19 04:21:38 1.13
  @@ -55,7 +55,7 @@
*   *
* = */
   
  -/* @version $Id: wa_request.c,v 1.12 2001/07/15 08:39:58 pier Exp $ */
  +/* @version $Id: wa_request.c,v 1.13 2001/07/19 04:21:38 pier Exp $ */
   #include wa.h
   
   /* Allocate a new request structure. */
  @@ -190,8 +190,9 @@
   
   /* Invoke a request in a web application. */
   int wa_rinvoke(wa_request *r, wa_application *a) {
  +if (a-depl!=wa_true)
  +return(wa_rerror(WA_MARK,r,404,Web-application not yet deployed));
   return(a-conn-prov-handle(r,a));
  -/*return(wa_rerror(r,500,This is being fixed));*/
   }
   
   void wa_rlog(wa_request *r, const char *f, const int l, const char *fmt, ...) {
  
  
  
  1.3   +2 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- wa_config.c   2001/05/10 08:54:14 1.2
  +++ wa_config.c   2001/07/19 04:21:38 1.3
  @@ -55,7 +55,7 @@
*   *
* = */
   
  -/* @version $Id: wa_config.c,v 1.2 2001/05/10 08:54:14 pier Exp $ */
  +/* @version $Id: wa_config.c,v 1.3 2001/07/19 04:21:38 pier Exp $ */
   #include wa.h
   
   /* Allocate and set up a codewa_application/code member. */
  @@ -92,6 +92,7 @@
   appl-conn=NULL;
   appl-conf=NULL;
   appl-lpth=NULL;
  +appl-depl=wa_false;
   
   /* Done */
   wa_debug(WA_MARK,Created application \%s\ in path \%s\,