Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > caf339018a6654e52c7cc23d1db11db5 > files > 32

apache-2.2.9-12.9mdv2009.0.src.rpm


__FILE__ expands to the full pathname during VPATH builds; this
clutters up the debug log (and also bloats binaries very slightly).
The -pie patch defines AP_FNAME during build which is equivalent
to basename(__FILE__); this uses AP_FNAME in place of __FILE__
for error logging.

AP_FNAME uses $(notdir ...), a GNU make extension, so this can't
go upstream.

Note this patch is useless without the -pie patch.

Upstream-HEAD: committed
Upstream-2.0: needed
Upstream-Status: better fix to server/log.c upstream

--- httpd-2.0.48/include/http_log.h.debuglog
+++ httpd-2.0.48/include/http_log.h
@@ -130,7 +130,11 @@
 
 extern int AP_DECLARE_DATA ap_default_loglevel;
 
+#ifdef AP_FNAME
+#define APLOG_MARK      AP_FNAME,__LINE__
+#else
 #define APLOG_MARK	__FILE__,__LINE__
+#endif
 
 /**
  * Set up for logging to stderr.