1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

895 Commits

Author SHA1 Message Date
Joe Orton
a45cbef86b * support/rotatelogs.c (usage, main): Add support for -c option.
Submitted by: Jan Kaluža <jkaluza redhat.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1189220 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 13:54:42 +00:00
Stefan Fritsch
4e0a7dc320 Increase the max line length from 2k to 128k and allocate the buffer on the
heap.

Every log line has an URL and one or more HTTP headers. Each can be 8k long.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1185119 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 12:16:59 +00:00
Stefan Fritsch
fb5cf8f74f If MaxMemFree is set, set SSL_MODE_RELEASE_BUFFERS in mod_ssl.
Always set SSL_MODE_RELEASE_BUFFERS in ab.

PR: 51618
Submitted by: Cristian Rodríguez <crrodriguez opensuse org>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1178079 13f79535-47bb-0310-9956-ffa450edef68
2011-10-01 19:48:14 +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
427c85bd23 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@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +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
Kaspar Brand
1eb818742f Drop support for the RSA BSAFE SSL-C toolkit from configure,
and remove #ifdef'ed code from mod_ssl and ab where applicable.

Consensus for dropping support for SSL/TLS toolkits other
than OpenSSL was reached on dev@httpd in June 2010 (message
with ID <20100602162310.GA11156@redhat.com> and follow-ups).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1154683 13f79535-47bb-0310-9956-ffa450edef68
2011-08-07 10:29:09 +00:00
Stefan Fritsch
1039437f77 Add some environment variables to the whitelist in suexec
PR: 51499
Submitted by: Graham Laverty <graham reg ca>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1146244 13f79535-47bb-0310-9956-ffa450edef68
2011-07-13 19:11:21 +00:00
Joe Orton
01792b69b7 * support/rotatelogs.c (main): Exit with success on EOF.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140226 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 16:16:56 +00:00
Joe Orton
b3e11effb7 Simplify state handling in rotatelogs, fixing -L support in the case
where open() fails for a new log file.

* support/rotatelogs.c (struct logfile): New structure.
  (struct rotate_status): Store only current logfile state here, using
  struct logfile.
  (close_logfile): Rename from closeFile; assume a valid logfile
  structure is passed in; simplify to use stored filename.
  (checkRotate, main): Adjust for new structure.
  (post_rotate): Adjust, move linkfile handling here.
  (doRotate): Simplify.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140138 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 12:29:34 +00:00
Joe Orton
550078b731 Tweak rotatelogs -p such that the program is invoked the first time a
new log file is opened as well as for rotations:

* support/rotatelogs.c (usage): Update.
  (post_rotate): Omit third arg if no prev logfile known.
  (doRotate): Invoke even if no previous logfile was open.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140099 13f79535-47bb-0310-9956-ffa450edef68
2011-06-27 10:57:10 +00:00
Stefan Fritsch
4d00c63be6 Support specifying the local address to use.
PR: 48930.
Submitted by: Peter Schuller <scode spotify com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1139530 13f79535-47bb-0310-9956-ffa450edef68
2011-06-25 12:00:26 +00:00
Joe Orton
0f14fc02dc rotatelogs: Add support for running a custom program after a log
rotation.

* support/rotatelogs.c (post_rotate): New function.
  (usage, dumpConfig): Update.
  (doRotate): Save old filename before rotate; call post_rotate after
  successful rotation.
  (main): Add -p argument.

* docs/manual/programs/rotatelogs.xml: Document -p.

PR: 51285
Submitted by: <sveniu ifi.uio.no>, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137590 13f79535-47bb-0310-9956-ffa450edef68
2011-06-20 10:28:05 +00:00
Stefan Fritsch
51226bdcca Fix various "variable 'x' set but not used" warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1125877 13f79535-47bb-0310-9956-ffa450edef68
2011-05-22 07:42:18 +00:00
Stefan Fritsch
2014acf62f Improvements found by cppcheck:
remove some unused variables and dead assignments, reduce the scope of some
variables, add some parens to improve readability


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103459 13f79535-47bb-0310-9956-ffa450edef68
2011-05-15 16:58:45 +00:00
Stefan Fritsch
61a0413706 Use APR_STATUS_IS_... in some more cases.
While this is not strictly necessary everywhere, it makes it much easier
to find the problematic cases.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1102124 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11 22:51:46 +00:00
Jeff Trawick
782c711893 fix some dead assignments found by the clang analyzer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1098162 13f79535-47bb-0310-9956-ffa450edef68
2011-04-30 21:18:58 +00:00
Igor Galić
cb8e4672d7 Make sure support/check_forensic works with mod_unique_id loaded too.
Author: Joes Shaefer


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1096775 13f79535-47bb-0310-9956-ffa450edef68
2011-04-26 15:10:00 +00:00
Stefan Fritsch
ded32d4e37 mod_ssl, ab: Support OpenSSL compiled without SSLv2 support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1090367 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 17:56:20 +00:00
Jeff Trawick
68889a9dae don't build checkgid or fcgistarter on MinGW
PR: 49535 (subset of reported issues, replacement for supplied patch)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089950 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 19:32:49 +00:00
Jeff Trawick
f97551a625 hide some unused code on Win32 and NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089910 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 15:16:20 +00:00
Guenter Knauf
888ec80125 Use a var INSTALLBASE to simplify NetWare installation rules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082821 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 04:56:06 +00:00
Guenter Knauf
bab978c56e Use var for prelude so its possible to change it at one place.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082811 13f79535-47bb-0310-9956-ffa450edef68
2011-03-18 03:09:27 +00:00
Joe Orton
828cb4661e * support/ab.c (test): Catch more calloc failures.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082586 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 16:42:16 +00:00
Guenter Knauf
2dc89e951b NetWare build overhaul in order to compile on Linux.
Some more fixes ...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079614 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 00:19:31 +00:00
Guenter Knauf
e8a8becc0f NetWare build overhaul in order to compile on Linux.
Removed absolute paths to imp files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079487 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 18:59:02 +00:00
Guenter Knauf
46b7e1d210 NetWare build overhaul in order to compile on Linux.
Take 1.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079407 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08 16:04:40 +00:00
Stefan Fritsch
0db0515ac7 Fix link errors for crypt() with --no-add-needed/--no-copy-dt-needed-entries,
which is the default for the gold linker.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1071426 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16 22:38:52 +00:00
Graham Leggett
74030fa378 rotatelogs: Add -e option to write logs through to stdout for optional
further processing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1051582 13f79535-47bb-0310-9956-ffa450edef68
2010-12-21 17:52:43 +00:00
Guenter Knauf
922ce76037 Some more casts to make MSVC calm ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040791 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30 21:59:01 +00:00
Guenter Knauf
c163534ebc Fixed return type to silent compiler warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1040733 13f79535-47bb-0310-9956-ffa450edef68
2010-11-30 19:48:06 +00:00
Rainer Jung
c8f912e613 Further trivial updates mod_disk_cache -> mod_cache_disk.
No functional change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039300 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 10:20:16 +00:00
Graham Leggett
27637bfdd8 mod_disk_cache renamed to mod_cache_disk, to be consistent with the
naming of other modules.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037229 13f79535-47bb-0310-9956-ffa450edef68
2010-11-20 14:58:34 +00:00
Stefan Fritsch
958d7a4b09 Remove workaround that was only necessary when htcacheclean included httpd.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1034018 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 18:09:06 +00:00
Guenter Knauf
ba6999ccef More splitting as suggested by minfrin.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033952 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 14:41:32 +00:00
Guenter Knauf
c86bf4327d Splitted off cache defines/structs used by htcacheclean.
This makes htcacheclean again independent from httpd.h.
Submitted by: NormW <normw gknw net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1033779 13f79535-47bb-0310-9956-ffa450edef68
2010-11-10 23:43:06 +00:00
Guenter Knauf
52210adbd1 Another NetWare makefile cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1026810 13f79535-47bb-0310-9956-ffa450edef68
2010-10-24 14:54:38 +00:00
Daniel Earl Poirier
6fc811e664 With rotatelogs -v, on platforms where APR_FINFO_NAME is not implemented,
the verbose printf for closing the file never occurred because apr_file_info_get()
always returned APR_INCOMPLETE.  Fix that so we still get a printf with the
information we get back.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024359 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 18:57:31 +00:00
Stefan Fritsch
fccb8870c7 Fix compilation of htcacheclean with enable-maintainer-mode / AP_DEBUG
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1023939 13f79535-47bb-0310-9956-ffa450edef68
2010-10-18 18:33:49 +00:00
Graham Leggett
abf1b9da3c htcacheclean: Teach htcacheclean to limit cache size by number of
inodes in addition to size of files. Prevents a cache disk from
running out of space when many small files are cached.

Move the directory delete process to the "purge" section, so that
inode counts are accurate when querying for stats only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1022230 13f79535-47bb-0310-9956-ffa450edef68
2010-10-13 18:41:56 +00:00
Graham Leggett
5c0b07953a Fix a segfault when tmpfiles are encountered while cleaning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004987 13f79535-47bb-0310-9956-ffa450edef68
2010-10-06 11:03:52 +00:00
Guenter Knauf
39a167fb32 Renamed optarg -> opt_arg to avoid name clashes with system-own optarg;
removed leftover from IDE build times.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004962 13f79535-47bb-0310-9956-ffa450edef68
2010-10-06 10:05:22 +00:00
Graham Leggett
a304385afa Ensure the correct pool is passed in when listing URLs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004641 13f79535-47bb-0310-9956-ffa450edef68
2010-10-05 13:52:37 +00:00
Graham Leggett
0509b44525 htcacheclean: Allow the listing of valid URLs within the cache, with
the option to list entry metadata such as sizes and times.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1004482 13f79535-47bb-0310-9956-ffa450edef68
2010-10-04 23:44:27 +00:00
Graham Leggett
a56a9e23e7 htcacheclean: Allow the option to round up file sizes to a given
block size, improving the accuracy of disk usage.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1002854 13f79535-47bb-0310-9956-ffa450edef68
2010-09-29 21:34:48 +00:00
Graham Leggett
2daba6a048 mod_disk_cache: Instead of creating an empty data file when the body is
empty, don't create a file at all, saving inodes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1002832 13f79535-47bb-0310-9956-ffa450edef68
2010-09-29 20:00:11 +00:00
Graham Leggett
8dd0a17fa3 htcacheclean: If the cache file format is unrecognised, remove the entry
from the cache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1002686 13f79535-47bb-0310-9956-ffa450edef68
2010-09-29 15:41:15 +00:00
Jeff Trawick
15734940ad simplify walking through array of returned apr_pollfd_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@998729 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 20:54:34 +00:00
Jeff Trawick
a20a0acb17 fix one error message, eliminate another that will never
be issued (since !n occurs when status != APR_SUCCESS)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@998726 13f79535-47bb-0310-9956-ffa450edef68
2010-09-19 20:47:38 +00:00
Stefan Fritsch
381673cdbf Support large log files in suexec
PR: 45856


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987861 13f79535-47bb-0310-9956-ffa450edef68
2010-08-22 10:34:20 +00:00