1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-08 04:22:21 +03:00
Commit Graph

80 Commits

Author SHA1 Message Date
Stefan Fritsch
e0184da329 Pass ap_errorlog_info to error_log hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1204614 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 17:36:26 +00:00
Jeff Trawick
7cc67a8c39 add conn_rec to error log hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1203634 13f79535-47bb-0310-9956-ffa450edef68
2011-11-18 13:10:06 +00:00
Stefan Fritsch
1951a037bf More cleanup: Expand tabs and some more indentation fixes
No functional change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 18:08:42 +00:00
Jim Jagielski
103f776c25 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:38:09 +00:00
Stefan Fritsch
3b66f2bef8 Fix build failure without HAVE_SYSLOG, e.g. on Netware
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142457 13f79535-47bb-0310-9956-ffa450edef68
2011-07-03 16:41:39 +00:00
Stefan Fritsch
d1574407f8 Expand the comment about APLOG_* and C++ a bit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086781 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 22:10:32 +00:00
Jeff Trawick
7be2d26631 consolidate logic to remove the pidfile in a new API,
ap_remove_pid(), related to existing ap_log_pid() and
ap_read_pid()

presumably this is useful to third-party MPMs as well


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086224 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 13:35:08 +00:00
Jeff Trawick
2c50305fbb aplog_module_index must always be set for C++, so simplify
the APLOG_MODULE_INDEX macro to avoid warnings with some
C++ compilers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085724 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 14:22:58 +00:00
Jeff Trawick
5d351b043c Correct C++ incompatibility with http_log.h.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1085719 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26 13:30:19 +00:00
Stefan Fritsch
23f8375f8b doxygen improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1044680 13f79535-47bb-0310-9956-ffa450edef68
2010-12-11 17:18:35 +00:00
Rainer Jung
147ef0da31 Fix constness in log macro.
Prevent compiler warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1023026 13f79535-47bb-0310-9956-ffa450edef68
2010-10-15 17:17:15 +00:00
Stefan Fritsch
b65066c6ac Add generate_log_id hook to allow to use the ID generated by mod_unique_id as
error log ID for requests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1002125 13f79535-47bb-0310-9956-ffa450edef68
2010-09-28 11:53:17 +00:00
Stefan Fritsch
ca8ee159b0 - add more comments explaining the logging macros
- make the documentation more doxygen friendly, as suggested by Justin
  Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@989377 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 21:29:41 +00:00
Stefan Fritsch
0d11ddb595 - Introduce ap_log_cserror to allow mod_ssl to associate log messages to
different servers than c->base_server.
- Adjust the scope of some mod_ssl trace logging from server to conn.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954611 13f79535-47bb-0310-9956-ffa450edef68
2010-06-14 19:59:05 +00:00
Stefan Fritsch
8aeb2e0e4e Use the correct loglevel checks in the wrappers for
ap_log_cerror/ap_log_rerror. This fixes per-dir loglevel configuration
for loglevels > notice.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@954188 13f79535-47bb-0310-9956-ffa450edef68
2010-06-13 09:18:20 +00:00
Rainer Jung
123c06b848 Fix ap_log_perror macro in case of C99 compilation with
APLOG_MAX_LOGLEVEL defined.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953248 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 08:41:36 +00:00
Stefan Fritsch
ed766d823a Fix build failure by reverting part of r953125
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953166 13f79535-47bb-0310-9956-ffa450edef68
2010-06-09 21:23:48 +00:00
Stefan Fritsch
dd5fdf5987 Fix some issues found by Ruediger Pluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@953125 13f79535-47bb-0310-9956-ffa450edef68
2010-06-09 19:31:26 +00:00
Stefan Fritsch
2334a1ea4f - Add loglevels to request_rec and conn_rec
- Introduce per-directory loglevel configuration


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951897 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 17:04:40 +00:00
Stefan Fritsch
98a1e93dca - Introduce log levels trace1/.../trace8
- Add macro wrappers for ap_log_*error. On C99, this will save argument
  preparation and function call overhead when a message is not logged
  because of the configured loglevel.
- Introduce per-module loglevel configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951893 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:54:51 +00:00
Daniel Earl Poirier
0c96068dc4 Log command line on startup, so there's a record of command line
arguments like -f.  Suggested by Shaya Potter.  [Dan Poirier]
PR: 48752


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@910684 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 20:50:10 +00:00
Daniel Earl Poirier
04fd4abf90 Fix a lot of doxygen warnings. Thanks to Brad Hards for the patch.
I added a few more fixes, and there are still more that might
need a doxygen expert.

PR: 48061
Submitted by: Brad Hards
Reviewed by: poirier


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@830527 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 13:25:49 +00:00
William A. Rowe Jr
eda8eee6b8 Fix docs and bump mmn minor
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775312 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 20:20:43 +00:00
William A. Rowe Jr
3aac4df095 Revert the default resource abuse introduced in r104019, which can mask
child logger process failures, by migrating back to 2.0.49 and prior when
rotated logs were reliable on Solaris, etc.

Provides two new piped syntaxes for ErrorLog; "||program" or "|$shellcmd",
where the existing 2.2 behavior may be preserved or the new 2.4 behavior
explicitly elected.  The default should discourage users from "|$" syntax
except as required, in the future.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775300 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 19:46:45 +00:00
Joe Orton
62d1ca305d Make the piped_log structure opaque:
* include/http_log.h: Remove piped_log structure definition here;
  (ap_piped_log_read_fd, ap_piped_log_write_fd): Turn macros into
  functions.             

* server/log.c: Move piped_log structure definition here; replace
  fds[2] with read_fd, write_fd.
  (ap_piped_log_read_fd, ap_piped_log_write_fd): New functions.
  (throughout...): Replace use of ap_piped_log_write_fd, 
  ap_piped_log_read_fd, with direct reference to structure fields.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775120 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 13:05:42 +00:00
Paul Querna
5e415009f3 Remove CORE_PRIVATE.
This define serves no modern purpose, since every module in the wild, including 
our own define it, for no purpose.

If you have functions which you do not want in the 'public' API, put them
in a private header, that is not installed, just like mod_ssl does.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645412 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 08:44:14 +00:00
Roy T. Fielding
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
Jeff Trawick
b5ed63df60 The new function ap_logs_child_init() is intended for use
only by the core server.  Require CORE_PRIVATE to obtain
the prototype.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@171093 13f79535-47bb-0310-9956-ffa450edef68
2005-05-20 10:50:17 +00:00
Jeff Trawick
f78a4e4a89 Prevent hangs of child processes when writing to piped loggers at
the time of graceful restart. 

PR:          26467
Reviewed by: Joe Orton



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170281 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 23:56:48 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
Jeff Trawick
fa81c17b16 fix prototypes in documentation to match actual const-ness
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105631 13f79535-47bb-0310-9956-ffa450edef68
2004-10-30 11:46:06 +00:00
Jeff Trawick
81e4e36b0e add ap_log_cerror(); use it in a couple of places in core output filter
so that the client IP address is recorded in the log


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105625 13f79535-47bb-0310-9956-ffa450edef68
2004-10-29 14:45:24 +00:00
André Malo
eeb57c17ad fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102619 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:40:53 +00:00
André Malo
129635b965 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102548 13f79535-47bb-0310-9956-ffa450edef68
2004-02-07 19:27:57 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
William A. Rowe Jr
c5b0867a95 Modify ap_open_logs (an internal function) to follow the hook open_logs
argument schema so it can be directly invoked by the hook handler.  Also
  clean up the open_logs processing to return an error rather than simply
  exit()ing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96829 13f79535-47bb-0310-9956-ffa450edef68
2002-09-15 22:04:01 +00:00
Bill Stoddard
f2a8d4f419 Fix the PATH exposure security problem I thought I fixed in 2.0.36.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96240 13f79535-47bb-0310-9956-ffa450edef68
2002-07-30 18:14:47 +00:00
William A. Rowe Jr
4b4e274fd6 Fix code comments
Submitted by:	Stas Bekman <stas@stason.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96007 13f79535-47bb-0310-9956-ffa450edef68
2002-07-11 06:14:30 +00:00
Bill Stoddard
cef791d3e8 Update comments for Stas Bekman
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95506 13f79535-47bb-0310-9956-ffa450edef68
2002-06-04 19:01:05 +00:00
Jeff Trawick
6fba81114c add ap_log_pid() for reading an Apache pid file
Submitted by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95235 13f79535-47bb-0310-9956-ffa450edef68
2002-05-23 12:19:09 +00:00
Jeff Trawick
3d54d08394 ignore APLOG_NOERRNO; note that it is deprecated
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95148 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 10:48:06 +00:00
Bill Stoddard
f0cee8f8fb Added the APLOG_TOCLIENT flag to ap_log_rerror() to
explicitly tell the server that warning messages should be sent
to the client in addition to being recorded in the error log.
Prior to this change, ap_log_rerror() always sent warning
messages to the client. In one case, a faulty CGI script caused
the server to send a warning message to the client that contained
the full path to the CGI script. This could be considered a
minor security exposure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94744 13f79535-47bb-0310-9956-ffa450edef68
2002-04-22 03:25:40 +00:00
William A. Rowe Jr
a43f5c4eb3 Introduced -E startup_logfile_name option to httpd to allow admins
to begin logging errors immediately.  This provides Win32 users
     an alternative to sending startup errors to the event viewer, and
     allows other daemon tool authors an alternative to logging to stderr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94681 13f79535-47bb-0310-9956-ffa450edef68
2002-04-17 16:36:28 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
William A. Rowe Jr
a5a68267b1 Allow the user to get detailed debugging information without a full
recompile [absolutely necessary on Win32 and other platforms that
  really don't support administrator-compilation.]

  -e level  follows the LogLevel options.

  The only question, should -e override the compiled-in default for
  the creation of the server_rec?  No strong feeling either way, here.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92891 13f79535-47bb-0310-9956-ffa450edef68
2002-01-17 20:15:12 +00:00
Victor J. Orlikowski
45b321443b httpd.exp and lots of other export files are generated based on the
AP[RU]_DECLARE macros. This commit gets mod_cgid working again as a DSO on
AIX.
However, this brings up the need to look for any functions that are
available as part of the API, and AP[RU]_DECLAREing them, so things don't
blow up in DSOs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89790 13f79535-47bb-0310-9956-ffa450edef68
2001-07-30 17:55:38 +00:00