tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native/apache-2.0 mod_jk.c
Date Fri, 12 Nov 2004 09:02:05 GMT
mturk       2004/11/12 01:02:04

  Modified:    jk/native/apache-2.0 mod_jk.c
  Log:
  Add missing include for unixd, and remove unused vars.
  
  Revision  Changes    Path
  1.100     +6 -3      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.99
  retrieving revision 1.100
  diff -u -r1.99 -r1.100
  --- mod_jk.c	12 Nov 2004 08:24:43 -0000	1.99
  +++ mod_jk.c	12 Nov 2004 09:02:04 -0000	1.100
  @@ -66,6 +66,10 @@
   #endif
   
   #include "apr_strings.h"
  +
  +#if APR_USE_SYSVSEM_SERIALIZE
  +#include "unixd.h"      /* for unixd_set_global_mutex_perms */
  +#endif
   /*
    * Jakarta (jk_) include files
    */
  @@ -335,7 +339,6 @@
   
           if (l) {
               /* BUFF *bf = p->r->connection->client; */
  -            size_t w = (size_t) l;
               size_t r = 0;
               long ll = l;
               char *bb = (char *)b;
  @@ -1663,7 +1666,7 @@
       worker_name = apr_table_get(r->notes, JK_WORKER_ID);
   
       /* Set up r->read_chunked flags for chunked encoding, if present */
  -    if (rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) {
  +    if ((rc = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK)) != APR_SUCCESS) {
           return rc;
       }
   
  
  
  

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


Mime
View raw message