httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stri...@apache.org
Subject cvs commit: httpd-2.0/include httpd.h http_config.h
Date Sun, 09 Mar 2003 00:27:16 GMT
striker     2003/03/08 16:27:16

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server   Tag: APACHE_2_0_BRANCH util_debug.c
               include  Tag: APACHE_2_0_BRANCH httpd.h http_config.h
  Log:
  Backport from 2.1.
  
  Reviewed by:	William A. Rowe, Thom May, Andre Malo
  
  * CHANGES
  
    Add this change.
  
  * STATUS
  
    Remove vote.
  
  * include/http_config.h (r1.101)
  
    (ap_get_module_config, ap_set_module_config): Always declare.
  
  * include/httpd.h (r1.195)
  
    (ap_strchr, ap_strchr_c, ap_strrchr, ap_strrchr_c, ap_strstr, ap_strstr_c):
      Always declare.
  
  * server/util_debug.c (r1.10)
  
    (ap_get_module_config, ap_set_module_config, ap_strchr, ap_strchr_c,
     ap_strrchr, ap_strrchr_c, ap_strstr, ap_strstr_c):
      Always implement and export.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.56 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.55
  retrieving revision 1.988.2.56
  diff -u -r1.988.2.55 -r1.988.2.56
  --- CHANGES	7 Mar 2003 21:27:36 -0000	1.988.2.55
  +++ CHANGES	9 Mar 2003 00:27:14 -0000	1.988.2.56
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.45
   
  +  *) Improve binary compatibility of the core between debug (aka
  +     maintainer-mode) and a non-debug compile.
  +     [Sander Striker]
  +
     *) mod_usertrack: don't set the cookie in subrequests. This works
        around the problem that cookies were set twice during fast internal
        redirects. PR 13211.  [André Malo]
  
  
  
  1.751.2.165 +1 -19     httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.164
  retrieving revision 1.751.2.165
  diff -u -r1.751.2.164 -r1.751.2.165
  --- STATUS	8 Mar 2003 17:16:07 -0000	1.751.2.164
  +++ STATUS	9 Mar 2003 00:27:15 -0000	1.751.2.165
  @@ -64,24 +64,6 @@
     [ please place file names and revisions from HEAD here, so it is easy to
       identify exactly what the proposed changes are! ]
   
  -    * One step closer to being binary compatible between debug and production
  -      (--enable-maintainer-mode or not).
  -      include/http_config.h r1.101
  -      include/httpd.h r1.195
  -      server/util_debug.c r1.10
  -      +1: striker, wrowe, thommay, nd
  -         nd: util_debug isn't a so cool place for the functions
  -         wrowe: yes - it would be cool to have debug flavors in the same
  -           files as their non-debug versions - but for macros, then what?
  -           Andre - suggest an alternative :-)
  -          nd: ehm, just to be clear: I was talking about get/set_module_config.
  -              (hmm, are the macros ever used now?). These should go into
  -              config.c, imho. It seems, I don't fully understand all the
  -              #defines and #undefs that happen there.
  -          nd: the recent commit (AP_DEBUG -> !AP_DEBUG) clarified it :)
  -              Thanks, Sander for your explanation.
  -              Now I'm not sure, whether they should really go elsewhere.
  -
       * AllowEncodedSlashes patch to permit %2f in path-info.
         CHANGES r1.1038
         include/ap_mmn.h r1.54 (based on r1.53)
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.2   +56 -6     httpd-2.0/server/util_debug.c
  
  Index: util_debug.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/util_debug.c,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- util_debug.c	3 Feb 2003 17:32:01 -0000	1.8.2.1
  +++ util_debug.c	9 Mar 2003 00:27:16 -0000	1.8.2.2
  @@ -62,38 +62,85 @@
   #include "httpd.h"
   #include "http_config.h"
   
  -#ifdef AP_DEBUG
  -
  -/* get rid of the macros we defined in httpd.h */
  +/* Possibly get rid of the macros we defined in httpd.h */
  +#if defined(strchr)
   #undef strchr
  +#endif
  +
  +#if defined (strrchr)
   #undef strrchr
  +#endif
  +
  +#if defined (strstr)
   #undef strstr
  +#endif
  +
  +
  +#if defined(ap_strchr)
  +#undef ap_strchr
  +AP_DECLARE(char *) ap_strchr(char *s, int c);
  +#endif
   
   AP_DECLARE(char *) ap_strchr(char *s, int c)
   {
       return strchr(s,c);
   }
  +
  +#if defined(ap_strchr_c)
  +#undef ap_strchr_c
  +AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
  +#endif
  +
   AP_DECLARE(const char *) ap_strchr_c(const char *s, int c)
   {
       return strchr(s,c);
   }
  +
  +#if defined(ap_strrchr)
  +#undef ap_strrchr
  +AP_DECLARE(char *) ap_strrchr(char *s, int c);
  +#endif
  +
   AP_DECLARE(char *) ap_strrchr(char *s, int c)
   {
       return strrchr(s,c);
   }
  +
  +#if defined(ap_strrchr_c)
  +#undef ap_strrchr_c
  +AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
  +#endif
  +
   AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c)
   {
       return strrchr(s,c);
   }
  +
  +#if defined(ap_strstr)
  +#undef ap_strstr
  +AP_DECLARE(char *) ap_strstr(char *s, const char *c);
  +#endif
  +
   AP_DECLARE(char *) ap_strstr(char *s, const char *c)
   {
       return strstr(s,c);
   }
  +
  +#if defined(ap_strstr_c)
  +#undef ap_strstr_c
  +AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
  +#endif
  +
   AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c)
   {
       return strstr(s,c);
   }
   
  +#if defined(ap_get_module_config)
  +#undef ap_get_module_config
  +AP_DECLARE(void *) ap_get_module_config(const ap_conf_vector_t *cv,
  +                                        const module *m);
  +#endif
   
   AP_DECLARE(void *) ap_get_module_config(const ap_conf_vector_t *cv,
                                           const module *m)
  @@ -110,11 +157,14 @@
    * @param val The module-specific data to set
    * @deffunc void ap_set_module_config(ap_conf_vector_t *cv, const module *m, void *val)
    */
  +#if defined(ap_set_module_config)
  +#undef ap_set_module_config
  +AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
  +                                      void *val);
  +#endif
  +
   AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
                                         void *val)
   {
       ((void **)cv)[m->module_index] = val;
   }
  -
  -
  -#endif /* AP_DEBUG */
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.191.2.2 +7 -7      httpd-2.0/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/httpd.h,v
  retrieving revision 1.191.2.1
  retrieving revision 1.191.2.2
  diff -u -r1.191.2.1 -r1.191.2.2
  --- httpd.h	3 Feb 2003 17:31:29 -0000	1.191.2.1
  +++ httpd.h	9 Mar 2003 00:27:16 -0000	1.191.2.2
  @@ -1696,6 +1696,13 @@
     */
   #include <string.h>
   
  +AP_DECLARE(char *) ap_strchr(char *s, int c);
  +AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
  +AP_DECLARE(char *) ap_strrchr(char *s, int c);
  +AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
  +AP_DECLARE(char *) ap_strstr(char *s, const char *c);
  +AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
  +
   #ifdef AP_DEBUG
   
   #undef strchr
  @@ -1704,13 +1711,6 @@
   # define strrchr(s, c)  ap_strrchr(s,c)
   #undef strstr
   # define strstr(s, c)  ap_strstr(s,c)
  -
  -AP_DECLARE(char *) ap_strchr(char *s, int c);
  -AP_DECLARE(const char *) ap_strchr_c(const char *s, int c);
  -AP_DECLARE(char *) ap_strrchr(char *s, int c);
  -AP_DECLARE(const char *) ap_strrchr_c(const char *s, int c);
  -AP_DECLARE(char *) ap_strstr(char *s, const char *c);
  -AP_DECLARE(const char *) ap_strstr_c(const char *s, const char *c);
   
   #else
   
  
  
  
  1.97.2.2  +1 -2      httpd-2.0/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
  retrieving revision 1.97.2.1
  retrieving revision 1.97.2.2
  diff -u -r1.97.2.1 -r1.97.2.2
  --- http_config.h	3 Feb 2003 17:31:29 -0000	1.97.2.1
  +++ http_config.h	9 Mar 2003 00:27:16 -0000	1.97.2.2
  @@ -459,7 +459,6 @@
   /** configuration vector structure */
   typedef struct ap_conf_vector_t ap_conf_vector_t;
   
  -#if defined(AP_DEBUG) || defined(DOXYGEN)
   /**
    * Generic accessors for other modules to get at their own module-specific
    * data
  @@ -482,7 +481,7 @@
   AP_DECLARE(void) ap_set_module_config(ap_conf_vector_t *cv, const module *m,
                                         void *val);
   
  -#else /* AP_DEBUG */
  +#if !defined(AP_DEBUG)
   
   #define ap_get_module_config(v,m)	\
       (((void **)(v))[(m)->module_index])
  
  
  

Mime
View raw message