tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Date Tue, 04 Dec 2001 21:38:27 GMT
costin      01/12/04 13:38:27

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Patch from Julius Gawlas. Fix mod_jk for the latest apache2.0
  
  Submitted by:	"GAWLAS,JULIUS (HP-Cupertino,ex1)" <julius_gawlas@hp.com>
  
  Revision  Changes    Path
  1.39      +10 -9     jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
  
  Index: mod_jk.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_jk.c	2001/12/04 19:51:02	1.38
  +++ mod_jk.c	2001/12/04 21:38:26	1.39
  @@ -60,7 +60,7 @@
    * Description: Apache 2 plugin for Jakarta/Tomcat                         *
    * Author:      Gal Shachor <shachor@il.ibm.com>                           *
    *                 Henri Gomez <hgomez@slib.fr>                               *
  - * Version:     $Revision: 1.38 $                                           *
  + * Version:     $Revision: 1.39 $                                           *
    ***************************************************************************/
   
   /*
  @@ -119,7 +119,7 @@
   #define ADD_SSL_INFO    
   
   /* module MODULE_VAR_EXPORT jk_module; */
  -AP_DECLARE_DATA module jk_module;
  +AP_MODULE_DECLARE_DATA module jk_module;
   
   
   typedef struct {
  @@ -335,7 +335,7 @@
               
               /* Debug - try to get around rwrite */
               while( ll > 0 ) {
  -                long toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
  +                size_t toSend=(ll>CHUNK_SIZE) ? CHUNK_SIZE : ll;
                   r = ap_rwrite((const char *)bb, toSend, p->r );
                   jk_log(main_log, JK_LOG_DEBUG, 
                          "writing %ld (%ld) out of %ld \n",toSend, r, ll );
  @@ -544,7 +544,7 @@
           }
   
           if(conf->envvars_in_use) {
  -            apr_array_header_t *t = apr_table_elts(conf->envvars);
  +            const apr_array_header_t *t = apr_table_elts(conf->envvars);
               if(t && t->nelts) {
                   int i;
                   apr_table_entry_t *elts = (apr_table_entry_t *)t->elts;
  @@ -572,7 +572,7 @@
       s->num_headers      = 0;
       if(r->headers_in && apr_table_elts(r->headers_in)) {
           int need_content_length_header = (!s->is_chunked && s->content_length
== 0) ? JK_TRUE : JK_FALSE;
  -        apr_array_header_t *t = apr_table_elts(r->headers_in);
  +        const apr_array_header_t *t = apr_table_elts(r->headers_in);
           if(t && t->nelts) {
               int i;
               apr_table_entry_t *elts = (apr_table_entry_t *)t->elts;
  @@ -1525,10 +1525,10 @@
       return;
   }
   
  -static void jk_post_config(apr_pool_t *pconf, 
  -                           apr_pool_t *plog, 
  -                           apr_pool_t *ptemp, 
  -                           server_rec *s)
  +static int jk_post_config(apr_pool_t *pconf, 
  +                          apr_pool_t *plog, 
  +                          apr_pool_t *ptemp, 
  +                          server_rec *s)
   {
       if(!s->is_virtual) {
           jk_server_conf_t *conf =
  @@ -1539,6 +1539,7 @@
               init_jk( pconf, conf, s );
           }
       }
  +    return OK;
   }
   
   /** Use the internal mod_jk mappings to find if this is a request for
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message