www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-25 10:59:28 +03:00
Code Activity
15,263 Commits 62 Branches 313 Tags
execd-dev
Commit Graph

158 Commits

Author SHA1 Message Date
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also 
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:11:44 +00:00
Jeff Trawick
76c0a8bdd2 fix minor annoyance on z/OS: __FILE__ is set to 
"./foo.c" instead of simply "foo.c", so filter
out all but the basename before logging it with
debug messages


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@178299 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-24 22:11:24 +00:00
Joe Orton
4741d91295 * server/log.c (piped_log_spawn): Don't leak an fd for each 
invocation.

Reviewed by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170719 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-18 08:03:37 +00:00
Joe Orton
5e080e68d7 * server/log.c (ap_open_piped_log): Remove errno handling. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170537 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-17 08:03:03 +00:00
Joe Orton
534ee6332c * server/log.c (piped_log_spawn): Return the APR error code, 
as expected by piped_log_maintenance (and fixing "Unknown
error" messages in error path there).
(ap_open_piped_log): Expect an APR error code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170441 13f79535-47bb-0310-9956-ffa450edef68
 2005-05-16 19:59:05 +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
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
Joe Orton
df6a1b30c2 * server/log.c (log_error_core): For APLOG_DEBUG on Unix, if __FILE__ 
is an absolute path (as in a VPATH build), just log the basename.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105258 13f79535-47bb-0310-9956-ffa450edef68
 2004-09-22 19:47:51 +00:00
Jeff Trawick
0f0a226ad1 tweak error handling when reading the pid file 
previously strtol() would look at unitialized
storage, but now the string is terminated where
the data read ends

give user a hint about removing the file if we can't
read/parse it properly

(somehow I ended up with a truncated httpd.pid on my
own system, leading to these tweaks)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104651 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-14 10:49:43 +00:00
Joe Orton
d2e2c4e584 * modules/ssl/ssl_engine_kernel.c (ssl_callback_SSLVerify_CRL), 
* server/log.c (ap_log_pid),
* server/mpm/prefork/prefork.c (accept_mutex_on, accept_mutex_off),
* support/htdbm.c (htdbm_list):
Fix some non-literal format strings (warnings from gcc -Wformat-security).

PR: 30585
Submitted by: Ulf Harnhammar (SITIC), Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104548 13f79535-47bb-0310-9956-ffa450edef68
 2004-08-11 14:25:30 +00:00
Jeff Trawick
5ef3a9aa2b start piped loggers via the shell, passing through the environment variables 
in the httpd process

this requires a new APR feature (APR_SHELLCMD_ENV), just added to apr 1.0-dev


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104019 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-23 12:32:22 +00:00
Jeff Trawick
14fad9b946 fix typo in recent commit 
Submitted by:	Jean-Jacques Clar


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103874 13f79535-47bb-0310-9956-ffa450edef68
 2004-06-09 12:43:25 +00:00
Jeff Trawick
0619fe8659 Pass environment variables through to piped loggers, resolving 
a regression since 1.3.

Submitted by:	  Ken Coar, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103796 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-27 23:35:41 +00:00
Joe Orton
96c0ef3f90 * modules/loggers/mod_log_config.c, server/log.c (open_error_log, 
ap_replace_stderr_log): Use APR_LARGEFILE when opening log files, to
allow log files to exceed the 2Gb limit if necessary.

PR: 13511


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103627 13f79535-47bb-0310-9956-ffa450edef68
 2004-05-06 10:18:07 +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
e88fcf3c64 fix copyright dates according to the first check in 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102589 13f79535-47bb-0310-9956-ffa450edef68
 2004-02-08 13:58:22 +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
625dc56af9 use the UNSAFE designation for unescaped errorlogs 
Submitted by: Geoffrey Young, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102306 13f79535-47bb-0310-9956-ffa450edef68
 2004-01-12 22:48:08 +00:00
André Malo
b5985f2a18 allow unescaped errorlogs via compile time switch 
Submitted by: Geoffrey Young <geoff modperlcookbook.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102302 13f79535-47bb-0310-9956-ffa450edef68
 2004-01-12 21:19:58 +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
Jeff Trawick
04980bafab Fix some piped log problems: bogus "piped log program '(null)' 
failed" messages during restart and problem with the logger
respawning again after Apache is stopped.

PR:                21648, 24805


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102048 13f79535-47bb-0310-9956-ffa450edef68
 2003-12-13 22:18:13 +00:00
André Malo
a7db87b9ad SECURITY [CAN-2003-0020]: escape arbitrary data before writing into the 
errorlog.

Reviewed by: Mark J Cox


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101873 13f79535-47bb-0310-9956-ffa450edef68
 2003-11-24 21:34:38 +00:00
Jeff Trawick
17a3b9261b no need to open error log for reading 
Submitted by:	Bjoern A. Zeeb
Reviewed by:	Jeff Trawick, who added the same change to another path


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100594 13f79535-47bb-0310-9956-ffa450edef68
 2003-07-14 14:48:40 +00:00
Bill Stoddard
9abecdf4e7 Win32: Whack the fully qualified names that appear in the log when 
loglevel debug is being used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100153 13f79535-47bb-0310-9956-ffa450edef68
 2003-06-03 18:05:20 +00:00
Martin Kraemer
de2e94a58a Oops - undo wrong commit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99056 13f79535-47bb-0310-9956-ffa450edef68
 2003-03-24 08:52:20 +00:00
Martin Kraemer
d8f10577ef On failures, try to add a hint what went wrong 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99055 13f79535-47bb-0310-9956-ffa450edef68
 2003-03-24 08:51:22 +00:00
William A. Rowe Jr
1e7b7d79bb SECURITY: Eliminated leaks of several file descriptors to child 
processes, such as CGI scripts.

PR: 17206
Submitted by:	Christian Kratzer <ck@cksoft.de>, Bjoern A. Zeeb <bz@zabbadoz.net>
Reviewed by:	Joe Orton, Will Rowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99032 13f79535-47bb-0310-9956-ffa450edef68
 2003-03-20 21:50:40 +00:00
Jeff Trawick
1023dd0e61 Fix an existing problem with error handling in piped_log_spawn(). 
Use new APR apr_proc_create() features to prevent Apache from starting
on Unix* in most cases where a piped log program can be started,
and add log messages for the other situations.  *Other platforms
already failed Apache initialization if a piped log program
couldn't be started.

PR:         15761


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98607 13f79535-47bb-0310-9956-ffa450edef68
 2003-02-10 16:27:28 +00:00
Jeff Trawick
aa7d6bb9a7 Make failing piped loggers work more like apache-1.3 by 
1) logging a message
2) trying to restart

PR:               15761


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98576 13f79535-47bb-0310-9956-ffa450edef68
 2003-02-04 17:21:50 +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
d93eef30f2 Some errors are impossible to fathom, without the user knowing certain 
base numbers.  This patch introduces "(EAP ##): Eap message" for the EAP
  errors, "(OS ##): Message" for modestly numbered os errors (under 100000)
  and hex "(OS 0x########): Message" for huge errors, which generally have
  bit-flag meanings and are usually represented in hex.

  This should make recognizing user bugreports a little less difficult.
  Would have done the same for other ranges, but they don't have (as) obvious
  numeric meanings on their own.

  Finally, we free up a buffer copy and give apr_strerror our string buffer
  to directly populate the message text.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97191 13f79535-47bb-0310-9956-ffa450edef68
 2002-10-13 03:25:04 +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
Victor J. Orlikowski
d982829aa1 Continue the Bill Rowe apr_size_t crusade. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95993 13f79535-47bb-0310-9956-ffa450edef68
 2002-07-10 06:01:14 +00:00
William A. Rowe Jr
178e10e3da Well the wrappers work out well... nice to be able to put off committing 
these API changes until the evening ;)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95587 13f79535-47bb-0310-9956-ffa450edef68
 2002-06-09 03:44:03 +00:00
William A. Rowe Jr
07fe8d864d Clean up new compiler emit noise 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95455 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-31 21:01:58 +00:00
Justin Erenkrantz
37b3fdc9d1 Simplify ap_read_pid and make it more portable. 
- Switch to using apr_file_read_full()
- Stop checking for \n (non-portable)
- Error if we read the entire buffer or the first digit isn't a number


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95338 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-29 04:39:07 +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
c871b41d3c stop using APLOG_NOERRNO in calls to ap_log_?error() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95149 13f79535-47bb-0310-9956-ffa450edef68
 2002-05-17 11:11:39 +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
Justin Erenkrantz
7f594c679f Fix 'control reaches end of non-void function' warning 
Submitted by:	Ben Collins-Sussman <sussman@collab.net>
Tweaked by:	    Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94695 13f79535-47bb-0310-9956-ffa450edef68
 2002-04-18 08:27:28 +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
William A. Rowe Jr
fc979c95b9 Spell out the merged log name, if we succeeded in merging the path 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93986 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-17 23:17:28 +00:00
Jeff Trawick
5aea2e8d73 get the prototype for ap_recent_ctime() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93980 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-17 12:40:16 +00:00
Brian Pane
e3bfcb1430 Use the "recent time" cache to optimize timestamp generation for 
the httpd error log

Background: According to some profile data that we collected on Solaris,
half the run time of ap_log_rerror() was spent in localtime(3).   With
this change, the recent-time cache ensures that the error logger won't
cause more than one localtime() call per second, no matter how high the
error rate is.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93977 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-17 05:13:12 +00:00
William A. Rowe Jr
65a37752ec Eliminate potential ap_server_root_relative segfaults, with the input 
of Jeff Trawick's style changes to the first patches.  Doesn't include
  the fixes to ssl [more complex], and we won't trap errors that involve
  ap_serverroot, since we presume that was normalized on the way in.
  Therefore, testing ap_server_root_relative(DEFAULT_FOO) cases
  should never become necessary.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93965 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-16 18:26:58 +00:00
Jeff Trawick
2df1a02f72 deal with the rename of kill_after_timeout to APR_KILL_AFTER_TIMEOUT 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93940 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-14 22:19:14 +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
Ian Holsman
17cc70b4ab Sander's Stylistic Submission 
(de-tab)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93717 13f79535-47bb-0310-9956-ffa450edef68
 2002-03-05 20:43:24 +00:00