+1 to commit in both httpd-2.1 and backport to 2.0. This code was simply wrong, we had no business overriding the clib headers.
At 03:44 PM 3/11/2005, Joe Schaefer wrote: >Any reason these str* overrides are still in httpd.h? >Here's a patch to remove them from trunk, tested with >both --enable-maintainer-mode and --enable-pool-debug set. > >Index: include/httpd.h >=================================================================== >--- include/httpd.h (revision 157131) >+++ include/httpd.h (working copy) >@@ -1723,17 +1723,8 @@ > 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 >+#ifndef AP_DEBUG > >-#undef strchr >-# define strchr(s, c) ap_strchr(s,c) >-#undef strrchr >-# define strrchr(s, c) ap_strrchr(s,c) >-#undef strstr >-# define strstr(s, c) ap_strstr(s,c) >- >-#else >- > /** use this instead of strchr */ > # define ap_strchr(s, c) strchr(s, c) > /** use this instead of strchr */ > >-- >Joe Schaefer
