httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/dav/main mod_dav.c mod_dav.h
Date Sun, 02 Jul 2000 09:08:51 GMT
gstein      00/07/02 02:08:47

  Modified:    src/modules/dav/main mod_dav.c mod_dav.h
  Log:
  run DAV's type_checker first so that it can grab the non-GET methods (it
      will pass thru GET for normal processing)
  fix the DBGn() macros for Apache 2.0
  
  Revision  Changes    Path
  1.4       +3 -2      apache-2.0/src/modules/dav/main/mod_dav.c
  
  Index: mod_dav.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/main/mod_dav.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- mod_dav.c	2000/06/28 11:23:50	1.3
  +++ mod_dav.c	2000/07/02 09:08:45	1.4
  @@ -3220,8 +3220,9 @@
   	** ### this isn't quite right... taking over the response can break
   	** ### things like mod_negotiation. need to look into this some more.
   	*/
  -	if (!conf->handle_get)
  +	if (!conf->handle_get) {
   	    return DECLINED;
  +        }
       }
   
       /* ### we should (instead) trap the ones that we DO understand */
  @@ -3247,7 +3248,7 @@
   static void register_hooks(void)
   {
       ap_hook_post_config(dav_init_handler, NULL, NULL, AP_HOOK_MIDDLE);
  -    ap_hook_type_checker(dav_type_checker, NULL, NULL, AP_HOOK_MIDDLE);
  +    ap_hook_type_checker(dav_type_checker, NULL, NULL, AP_HOOK_FIRST);
   }
   
   /*---------------------------------------------------------------------------
  
  
  
  1.5       +4 -4      apache-2.0/src/modules/dav/main/mod_dav.h
  
  Index: mod_dav.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/dav/main/mod_dav.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mod_dav.h	2000/06/29 00:53:38	1.4
  +++ mod_dav.h	2000/07/02 09:08:46	1.5
  @@ -91,13 +91,13 @@
   #define DAV_DEBUG 1
   #define DEBUG_CR	"\n"
   #define DBG0(f)		ap_log_error(APLOG_MARK, \
  -				APLOG_ERR|APLOG_NOERRNO, NULL, (f))
  +				APLOG_ERR|APLOG_NOERRNO, 0, NULL, (f))
   #define DBG1(f,a1)	ap_log_error(APLOG_MARK, \
  -				APLOG_ERR|APLOG_NOERRNO, NULL, f, a1)
  +				APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1)
   #define DBG2(f,a1,a2)	ap_log_error(APLOG_MARK, \
  -				APLOG_ERR|APLOG_NOERRNO, NULL, f, a1, a2)
  +				APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1, a2)
   #define DBG3(f,a1,a2,a3) ap_log_error(APLOG_MARK, \
  -				APLOG_ERR|APLOG_NOERRNO, NULL, f, a1, a2, a3)
  +			       APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1, a2, a3)
   #else
   #undef DAV_DEBUG
   #define DEBUG_CR	""
  
  
  

Mime
View raw message