cvs commit: jakarta-tomcat-4.0/connectors/apache-1.3 mod_webapp.c

[pier]

pier        00/12/13 19:47:08

  Modified:    connectors/apache-1.3 mod_webapp.c
  Log:
  Now headers are passed correctly to Apache.
  
  Revision  Changes    Path
  1.6       +12 -4     jakarta-tomcat-4.0/connectors/apache-1.3/mod_webapp.c
  
  Index: mod_webapp.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/apache-1.3/mod_webapp.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- mod_webapp.c      2000/12/06 11:20:25     1.5
  +++ mod_webapp.c      2000/12/14 03:47:07     1.6
  @@ -55,7 +55,7 @@
    *                                                                           *
    * ========================================================================= */
   
  -// CVS $Id: mod_webapp.c,v 1.5 2000/12/06 11:20:25 pier Exp $
  +// CVS $Id: mod_webapp.c,v 1.6 2000/12/14 03:47:07 pier Exp $
   // Author: Pier Fumagalli <mailto:[EMAIL PROTECTED]>
   
   #include <httpd.h>
  @@ -412,10 +412,13 @@
    */
   static boolean webapp_callback_settype(wa_request *req, char *type) {
       request_rec *r=webapp_callback_check(WA_LOG,req);
  +    char *t="";
   
       if (r==NULL) return(FALSE);
  +    if (t!=NULL) t=ap_pstrdup(r->pool,type);
   
  -    r->content_type=type;
  +    r->content_type=t;
  +    ap_table_add(r->headers_out, "Content-Type", t);
       return(TRUE);
   }
   
  @@ -430,10 +433,15 @@
   static boolean webapp_callback_setheader(wa_request *req, char *name,
                                            char *value) {
       request_rec *r=webapp_callback_check(WA_LOG,req);
  +    char *n="";
  +    char *v="";
   
       if (r==NULL) return(FALSE);
  -
  -    ap_table_add(r->headers_out, name, value);
  +    
  +    if (n!=NULL) n=ap_pstrdup(r->pool,name);
  +    if (v!=NULL) v=ap_pstrdup(r->pool,value);
  +    
  +    ap_table_add(r->headers_out,n,v);
       return(TRUE);
   }