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

32 Commits

Author SHA1 Message Date
Jim Jagielski
e9e8bd7322 Merge r1818802, r1818825 from trunk:
mod_dumpio: do nothing below log level TRACE7.

For instance, depending on EnableMMAP/Sendfile configuration, don't split
file brigades to 8K heap buckets upon reading.



mod_dumpio: follow up to r1818802.

Negate APLOGctrace7(c) test!

Also, return DECLINED when nothing is to be done, same result as OK but
possibly more semantically correct.


Submitted by: ylavic
Reviewed by: jailletc36, jorton, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828743 13f79535-47bb-0310-9956-ffa450edef68
2018-04-09 15:42:14 +00:00
William A. Rowe Jr
15d6b5842e Clean up embedded abspaths that came along with resource
compilation on win32 (haven't worked out the clean patch
to apr/build/fixwin32mak.pl for this, yet).

This caused no issues in the 2.4.20 package, and does not
block a release.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1738140 13f79535-47bb-0310-9956-ffa450edef68
2016-04-07 15:04:27 +00:00
William A. Rowe Jr
3bfd026116 Win32-specific build files.
Going forwards, keep win32 build in svn once a tree is stable.
Visual Studio 2010 users cannot convert our .dsp files, and
ddk toolchain users couldn't either.

Applies the same logic as r1100294 on the 2.2.x branch.

Until the cmake build schema is entirely mature, these files
are needed for command-line builds of the 2.4 tree, and are
expected to change very little until the EOL of 2.4 branch.

The .dsp source files are not directly usable for any shipping
version of MSVC/Visual Studio (post-Visual Studio 97 release),
while the .mak exports of these projects are usable on any flavor
of the MS nmake build environment.  The .dsp source files are
retained for those users wishing to import these projects into
the modern vcproj/sln file format.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736270 13f79535-47bb-0310-9956-ffa450edef68
2016-03-23 03:53:49 +00:00
Eric Covener
ee3b44ebf4 Merge r1412278 from https://svn.apache.org/repos/asf/httpd/httpd/trunk/:
mod_dumpio: Correctly log large messages + style issues
PR 54179 

Submitted by: Marek Wianecki
Reviewed by: jailletc36, sf, druggeri




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1416749 13f79535-47bb-0310-9956-ffa450edef68
2012-12-04 02:28:16 +00:00
Stefan Fritsch
e95dbfcf35 Merge r1301111:
Properly handle errors from subsequent input filters.

PR 52914.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1301686 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 18:39:29 +00:00
Rainer Jung
d2d9f588c2 Line ordering. Partial backport of 1221216
from trunk to keep deltas small.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1238526 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 13:48:36 +00:00
Guenter Knauf
7df75d7484 Some cosmetic NetWare makefile tweaks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1221213 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 11:55:03 +00:00
Stefan Fritsch
4a3467e4c6 Merge r1211663:
Remove usage of APLOG_NOERRNO. It has been a no-op since at least 2.0.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211669 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 22:06:41 +00:00
Jeff Trawick
baa51e6a51 mod_dumpio: s/ap_log_error/ap_log_cerror/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199520 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 23:07:30 +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
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
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
Daniel Earl Poirier
cdbc0f2c3f Warning in configure -h that mod_dumpio was only for developers
and testing was erroneous.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029931 13f79535-47bb-0310-9956-ffa450edef68
2010-11-02 00:47:21 +00:00
Daniel Earl Poirier
4c477008d4 Add to modules' help text (displayed by ./configure -h) more
information that will be useful in deciding whether to enable
them or not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1029814 13f79535-47bb-0310-9956-ffa450edef68
2010-11-01 20:02:51 +00:00
Guenter Knauf
5e8988e256 Removed obsolete include paths from NetWare makefiles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966904 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 23:38:58 +00:00
Stefan Fritsch
8f1e26cc21 Replace DumpIOLogLevel with trace log levels
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951902 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 17:08:57 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
William A. Rowe Jr
379528fdd6 missing prototype - compile before committing please
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907879 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 01:58:28 +00:00
Stefan Fritsch
bb616ddda3 Print directive name in error message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907012 13f79535-47bb-0310-9956-ffa450edef68
2010-02-05 17:38:08 +00:00
Stefan Fritsch
60821a3b74 replace duplicate code with new function ap_parse_log_level()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@905454 13f79535-47bb-0310-9956-ffa450edef68
2010-02-01 23:27:32 +00:00
William A. Rowe Jr
ef81751829 %.*s precision supposedly takes an int, according to gcc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808681 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 23:33:09 +00:00
Ruediger Pluem
fdf34d4266 * remove uneeded remains of r750126.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750132 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 20:05:09 +00:00
William A. Rowe Jr
22f74392e9 Accelerate mod_dumpio processing;
* drop a frequent query for the mod configuration (pass as f->ctx)
 * drop one copy, at least for ASCII

and ensure larger buffers are logged in their entirety.  Some clarity
in output can be added by designating continuations vs first lines.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@750126 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 19:55:09 +00:00
Martin Kraemer
8e05d0f782 For correct dumping, translate data from ASCII
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@570753 13f79535-47bb-0310-9956-ffa450edef68
2007-08-29 11:15:07 +00:00
Guenter Knauf
47fff8d790 removed obsolete -prefix; minor cosmetic changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@521264 13f79535-47bb-0310-9956-ffa450edef68
2007-03-22 13:45:54 +00:00
Bradley Nicholes
ba4156cadd Implement a BASEDIR build environment variable to allow the NetWare build to relocate the install files
Submitted by: Guenter Knauf <fuankg apache org>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@502051 13f79535-47bb-0310-9956-ffa450edef68
2007-01-31 23:55:44 +00:00
William A. Rowe Jr
1fc3b01590 Embed the .manifest files of all httpd binaries as a post-build
operation.  This ensures the exported (Studio 97 generated) .mak
files create a usable Apache directly from the VC 8 (Studio 2005)
command line environment.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@495126 13f79535-47bb-0310-9956-ffa450edef68
2007-01-11 05:37:20 +00:00
Jim Jagielski
21038d2649 So I'm sitting in Rich's talk and think to myself, it's kind
of stupid that DumpIO always logs at Debug, esp when
you consider that it's likely you'll be doing so
in conjunction with SSL... One Big Log is understating
it! :)

Add DumpIOLogLevel to allow one to change the level...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@463291 13f79535-47bb-0310-9956-ffa450edef68
2006-10-12 15:53:33 +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
William A. Rowe Jr
b31873b39b This tree can't be named modules/debug/. Now it isn't.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419652 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 18:47:09 +00:00