1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-28 11:57:22 +03:00
Commit Graph

195 Commits

Author SHA1 Message Date
Jim Jagielski
60ba8573a6 Merge r693120, r720250 from trunk:
Add in useful feature. %k which logs the keepalives
value.
PR: 45762
        Dan Poirier <poirier@pobox.com>


Make %k work as it should. No regression noted in perl
test framework.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@721033 13f79535-47bb-0310-9956-ffa450edef68
2008-11-26 23:24:20 +00:00
Eric Covener
db94ccc09a Merge r579425 from trunk:
mod_log_config: Add format options for %p so that the actual local
or remote port can be logged.  

PR:  43415
Submitted by: Adam Hasselbalch Hansen <ahh@one.com>
Extensively commented on and/or modified by Ruediger Pluem and Jeff Trawick



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@654348 13f79535-47bb-0310-9956-ffa450edef68
2008-05-08 00:34:36 +00:00
Jim Jagielski
047918ac48 * mod_logio: Provide optional function to allow modules to adjust the
bytes_in count 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@631359 13f79535-47bb-0310-9956-ffa450edef68
2008-02-26 19:47:51 +00:00
Ruediger Pluem
ed7c9c33f9 Merge r599651, r608508, r611376 from trunk:
Get rid of some compiler warnings.

* Silence a compiler warning by using the correct format.

* Hex pids are bogus anyway and on environments with APR_PID_T_FMT d this
  breaks and print x.

Submitted by: rpluem
Reviewed by: rpluem, covener, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@614661 13f79535-47bb-0310-9956-ffa450edef68
2008-01-23 20:54:16 +00:00
Guenter Knauf
0e8878ded1 removed obsolete -prefix; minor cosmetic changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@563191 13f79535-47bb-0310-9956-ffa450edef68
2007-08-06 17:01:03 +00:00
Bradley Nicholes
786636766c 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/branches/2.2.x@505572 13f79535-47bb-0310-9956-ffa450edef68
2007-02-09 23:59:15 +00:00
William A. Rowe Jr
003a033071 Add .manifest post-processing to the httpd build for users of VC 8
(Studio 2005, 'free' Express or full edition) command line builds.

Backports 495126, adjusted for debugging/debug path change between
trunk and 2.2 branch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@495130 13f79535-47bb-0310-9956-ffa450edef68
2007-01-11 05:44:54 +00:00
William A. Rowe Jr
50d63a7fe6 Sync to httpd/trunk where we've reverted the /d "LONG_NAME=foo bar" syntax,
which confuses the ability of MS VS 6 to export makefiles.

  Also syncs the fix to some debug/release targets observed by hunter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@429039 13f79535-47bb-0310-9956-ffa450edef68
2006-08-05 20:19:08 +00:00
Roy T. Fielding
ae1748a99f update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@421103 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 03:38:44 +00:00
William A. Rowe Jr
913de3b472 This resource /D syntax was pretty horridly imported into VS 2005,
change the quotation to ensure a peaceful transition to sln/vcproj files.

Backports: 397647

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@397651 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:51:48 +00:00
William A. Rowe Jr
967c94daee Remove all /machine:I386 references, these are getting in the way
of switching linkers from the x86 (default linker) to x64 or other
  possible target platforms.  (Also this commit cleans up lingering
  /GX switches from the 'BASE' options that are supposed to be unused.)

Backports: 397407

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@397649 13f79535-47bb-0310-9956-ffa450edef68
2006-04-27 21:47:41 +00:00
William A. Rowe Jr
9b1b56ab68 After appropriate time sitting on trunk, and some review by our
win32 builders, eliminate platform-specific use of 'awk' to create
  our .rc resources.  (Deliberately waited until a clean 2.2.2 was
  pulled from the branch.)  The end goal is to make building simpler
  for our 'free' VisualStudio 2005 Express users, to encourage more
  end users to explore the source code.  Eliminating thousands of
  lines of build-script is a nice side effect.

Backports: 395418

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396974 13f79535-47bb-0310-9956-ffa450edef68
2006-04-25 20:24:55 +00:00
Paul Querna
786089eef9 Revert r395231 from the 2.2.x branch. This gets us back to the old place with regard to the copyright statements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@396056 13f79535-47bb-0310-9956-ffa450edef68
2006-04-22 01:53:06 +00:00
William A. Rowe Jr
84871ce3fe Backport 395419, replace /GX win32 compile flag with /EHsc to match.
Reviewed by all active win32 contributors, and committed as an arch
  maintenance fix.  This permits Win32 VisualStudio 2005 users to build
  httpd without extranious 'deprectated option' emits.

Reviewed by: wrowe, colm

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395961 13f79535-47bb-0310-9956-ffa450edef68
2006-04-21 17:47:19 +00:00
Colm MacCarthaigh
8ffd8c554b Update the last year of copyright for the 2.2.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@395231 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:33:16 +00:00
Jim Jagielski
b3181bddae No functional change: remove trailing whitespace. This also means
that "blank" lines, which had consisted of just spaces
and/or tabs are now truly blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@332309 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:20:05 +00:00
Colm MacCarthaigh
de0c9cf981 Merge r265033 from trunk.
Author: trawick
Reviewed by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@312911 13f79535-47bb-0310-9956-ffa450edef68
2005-10-11 16:25:16 +00:00
Colm MacCarthaigh
69b359cfdc Backport the Doxygen changes to the 2.2.x branch. No functional changes,
however backporting these doxygen fixes makes it significantly easier to diff
trunk and the 2.2.x branch, to sort out what's what. And we might as well
release with nicer doxygen markup.

Submitted by: Neale Ranns <neale ranns.org>
Reviewed by:  Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292540 13f79535-47bb-0310-9956-ffa450edef68
2005-09-29 20:44:53 +00:00
Colm MacCarthaigh
e954421483 Backport r265506, r240044 and r240049 to the 2.2.x branch; Appends .PID to the
ScriptSock filename. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@289972 13f79535-47bb-0310-9956-ffa450edef68
2005-09-18 20:39:34 +00:00
Brian Pane
34e82d6a25 use struct assignment instead of memcpy so the compiler can decide whether to inline the copy loop or call memcpy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@208972 13f79535-47bb-0310-9956-ffa450edef68
2005-07-03 21:21:46 +00:00
Joe Orton
9687f8c6a7 Update remaining 2004 copyright notices.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190592 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 13:54:34 +00:00
Jeff Trawick
39714846f7 fix typo in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170914 13f79535-47bb-0310-9956-ffa450edef68
2005-05-19 11:53:48 +00:00
William A. Rowe Jr
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +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
Paul Querna
196fce4667 * mod_log_config.c: Revert r109866 which used apr_file_writev instead of an
apr_file_write w/ a memcpy. Roy Fielding provided a -1 veto
                    on the commit, based on concerns that writev is not 
                    guaranteed to be atomic like a write.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@110069 13f79535-47bb-0310-9956-ffa450edef68
2004-12-07 03:41:18 +00:00
Paul Querna
9d58018f5e mod_log_config.c: Use iovecs to write the log line to eliminate a memcpy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@109866 13f79535-47bb-0310-9956-ffa450edef68
2004-12-05 07:05:23 +00:00
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
Jeff Trawick
ecab476cae mod_log_config: Fix a bug which prevented request completion time
from being logged for I_INSIST_ON_EXTRA_CYCLES_FOR_CLF_COMPLIANCE
processing.

PR:             29696
Submitted by:   Alois Treindl <alois astro.ch>
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103991 13f79535-47bb-0310-9956-ffa450edef68
2004-06-20 13:08:06 +00:00
André Malo
e47931813e this should save one or two cycles
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103767 13f79535-47bb-0310-9956-ffa450edef68
2004-05-25 19:39:50 +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
b8e029ae12 fix build on systems without unistd.h
Submitted by: Guenter Knauf <eflash gmx.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103530 13f79535-47bb-0310-9956-ffa450edef68
2004-04-26 18:58:59 +00:00
André Malo
de6b6ff89d add dsp and exp file for mod_log_forensic
incorporate into Win32 build


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103454 13f79535-47bb-0310-9956-ffa450edef68
2004-04-19 18:34:59 +00:00
André Malo
c2a3b20bea cleanup log_header_out function:
- no need to ask r->err_headers_out, because it's already merged with
  r->headers_out at this stage
- allow multiple headers like Set-Cookie to be logged properly

PR: 27787


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103331 13f79535-47bb-0310-9956-ffa450edef68
2004-04-10 17:48:52 +00:00
André Malo
d3ffc73171 no longer remove the EOS bucket
PR: 27928
Submitted by: Bojan Smojver <bojan rexursive.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103263 13f79535-47bb-0310-9956-ffa450edef68
2004-04-03 20:50:00 +00:00
Jeff Trawick
3273ddb6de fix an old misfeature: "BufferedLogs Off" would sort-of turn
buffered logging on as it set the log writer to the buffered log
writer, though it would leave the are-logs-buffered flag off

this misfeature combined with recent mutex logic for buffered logs
led to a segfault with "BufferedLogs Off"


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102783 13f79535-47bb-0310-9956-ffa450edef68
2004-02-26 20:15:26 +00:00
Jeff Trawick
7122d6ea3a a kind fix for a compile error unfortunately broke an order
dependency...  the buffered logs array needs to be initialized
prior to opening the logs


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102781 13f79535-47bb-0310-9956-ffa450edef68
2004-02-26 20:00:55 +00:00
André Malo
d20937008b forward port to not log twice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102730 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 17:09:20 +00:00
André Malo
f93ccbd7c2 do not exit() from inside a module!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102729 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 16:38:36 +00:00
André Malo
c3617eb632 ugh! Fix log open error condition, which never matched.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102728 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 15:53:49 +00:00
André Malo
4f71cbdc98 allow log pipes to be relative to serverroot as well
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102727 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 15:45:02 +00:00
André Malo
9ae33ec8ed there's no such default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102725 13f79535-47bb-0310-9956-ffa450edef68
2004-02-21 15:23:24 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
3097e08b49 oops
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102568 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:14:07 +00:00
André Malo
5410a0d131 fix copyright dates according to the first checkin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102566 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:10:29 +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
866b6af8f3 in conservative C declarations still have to be the first in a function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102361 13f79535-47bb-0310-9956-ffa450edef68
2004-01-18 00:00:18 +00:00
Jeff Trawick
e6834bc9b4 mod_log_config: Fix corruption of buffered logs with threaded
MPMs.

PR:               25520


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102355 13f79535-47bb-0310-9956-ffa450edef68
2004-01-17 00:16:45 +00:00
Joe Orton
b92c3e35e8 * modules/loggers/config.m4: Fix --enable-mods-shared=all case where
$enable_log_forensic gets set to the empty string.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102241 13f79535-47bb-0310-9956-ffa450edef68
2004-01-09 11:47:39 +00:00
Martin Kraemer
601c88636f Undo last change in order not to break Netware builds...
PR:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102190 13f79535-47bb-0310-9956-ffa450edef68
2004-01-05 11:12:03 +00:00