httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/os/win32 BaseAddr.ref
Date Wed, 11 Aug 2004 21:14:49 GMT
wrowe       2004/08/11 14:14:49

  Modified:    .        CHANGES
               modules/proxy mod_proxy.c
               os/win32 BaseAddr.ref
  Log:
  Enable backwards compatibility with 2.0-HEAD, define ajp module base,
  and note CHANGES so far to proxy
  
  Submitted by:	mturk
  
  Revision  Changes    Path
  1.1549    +9 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1548
  retrieving revision 1.1549
  diff -u -r1.1548 -r1.1549
  --- CHANGES	11 Aug 2004 13:19:21 -0000	1.1548
  +++ CHANGES	11 Aug 2004 21:14:49 -0000	1.1549
  @@ -2,6 +2,15 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_proxy.c and proxy_util.c: Enable compiling on 2.0-HEAD 
  +     (for backwards compatibility):
  +     Avoids mod_ssl.h (not included in 2.0-HEAD) and
  +     use apr_socket_create_ex for 0.9.x 
  +     [Mladen Turk]
  +
  +  *) Added proxy_ajp.c module for proxy support to ajp:// backends.
  +     [Jean Frederic Clere]
  +
     *) SECURITY: CAN-2004-0748 (cve.mitre.org)
        mod_ssl: Fix a potential infinite loop.  PR 29964.  [Joe Orton]
   
  
  
  
  1.104     +6 -0      httpd-2.0/modules/proxy/mod_proxy.c
  
  Index: mod_proxy.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/mod_proxy.c,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- mod_proxy.c	4 Jul 2004 22:39:06 -0000	1.103
  +++ mod_proxy.c	11 Aug 2004 21:14:49 -0000	1.104
  @@ -20,7 +20,13 @@
   #include "mod_core.h"
   
   #include "apr_optional.h"
  +
  +#if (MODULE_MAGIC_NUMBER_MAJOR > 20020903)
   #include "mod_ssl.h"
  +#else
  +APR_DECLARE_OPTIONAL_FN(int, ssl_proxy_enable, (conn_rec *));
  +APR_DECLARE_OPTIONAL_FN(int, ssl_engine_disable, (conn_rec *));
  +#endif
   
   #ifndef MAX
   #define MAX(x,y) ((x) >= (y) ? (x) : (y))
  
  
  
  1.26      +1 -0      httpd-2.0/os/win32/BaseAddr.ref
  
  Index: BaseAddr.ref
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/win32/BaseAddr.ref,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- BaseAddr.ref	7 Feb 2003 21:30:52 -0000	1.25
  +++ BaseAddr.ref	11 Aug 2004 21:14:49 -0000	1.26
  @@ -64,3 +64,4 @@
   util_ldap.so            0x6FAD0000    0x00010000
   mod_auth_ldap.so        0x6FAC0000    0x00010000
   mod_ident.so            0x6FAB0000    0x00010000
  +mod_proxy_ajp.so        0x6FAA0000    0x00010000
  
  
  

Mime
View raw message