www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
29,900 Commits 62 Branches 313 Tags
httpdunit
Commit Graph

297 Commits

Author SHA1 Message Date
Jim Jagielski
215b84c41e Support use of optional "tag" in syslog entries. Streamline the patch. 
PR 60525.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1784318 13f79535-47bb-0310-9956-ffa450edef68
 2017-02-24 19:39:00 +00:00
Jim Jagielski
cc97ce3e52 https://bz.apache.org/bugzilla/show_bug.cgi?id=58855 
Optimize check for empty strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778067 13f79535-47bb-0310-9956-ffa450edef68
 2017-01-09 22:08:01 +00:00
Rainer Jung
d79b514c4b Fix spelling in comments and text files. 
No functional change.
PR 59990


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1756038 13f79535-47bb-0310-9956-ffa450edef68
 2016-08-11 19:50:02 +00:00
William A. Rowe Jr
f4cc76ee71 Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygen 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747469 13f79535-47bb-0310-9956-ffa450edef68
 2016-06-09 00:06:42 +00:00
William A. Rowe Jr
aae25185ad Support %{c}h for conn-hostname, %h for useragent_host 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730129 13f79535-47bb-0310-9956-ffa450edef68
 2016-02-12 22:08:29 +00:00
Rainer Jung
a1ca0c1f48 Remove new APLOGNO form mod_log_debug. 
Here we log the custom log messages
provided by the user.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725468 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 10:57:24 +00:00
Rainer Jung
44ce30494e Added many log numbers to log statements that 
had none.

Handled all files in modules/.

I used the coccinelle script provided by Stefan.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1725392 13f79535-47bb-0310-9956-ffa450edef68
 2016-01-19 00:03:18 +00:00
Yann Ylavic
4bfe0a6bba Follow up to r1715880: revert more abusive ap_casecmpstr[n]() usages. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1722150 13f79535-47bb-0310-9956-ffa450edef68
 2015-12-29 15:32:27 +00:00
Yann Ylavic
e30575b0b0 More ap_casecmpstr[n]() usages (follow up to r1715876). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715880 13f79535-47bb-0310-9956-ffa450edef68
 2015-11-23 16:48:35 +00:00
Yann Ylavic
c80e6b2a34 Use new ap_casecmpstr[n]() functions where appropriate (not exhaustive). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715876 13f79535-47bb-0310-9956-ffa450edef68
 2015-11-23 16:46:01 +00:00
Yann Ylavic
3c9ddf44bf Revert r1715789: will re-commit without spurious functional changes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715869 13f79535-47bb-0310-9956-ffa450edef68
 2015-11-23 16:28:36 +00:00
Yann Ylavic
29843dc73f Use new ap_casecmpstr[n]() functions where appropriate (not exhaustive). 
[Reverted by r1715869]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715789 13f79535-47bb-0310-9956-ffa450edef68
 2015-11-23 12:33:09 +00:00
Christophe Jaillet
f9b3fc9d99 Remove some useless 'return' statements. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1715568 13f79535-47bb-0310-9956-ffa450edef68
 2015-11-21 20:45:08 +00:00
Yann Ylavic
086fc25c68 Revert r1705157: why not "insert the filter (twice) for sub-requests" actually? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705160 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-24 21:31:34 +00:00
Yann Ylavic
a4862ba434 Follow up to r1705134: don't insert the filter (twice) for sub-requests. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705157 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-24 21:26:22 +00:00
Eric Covener
f14fc92c36 Avoid storing request stuff in r->connection->conn_config to 
avoid problems with e.g. write completion.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705134 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-24 20:21:36 +00:00
Eric Covener
985e707265 Don't count initial handshake I/O when determining the first byte. 
PR58454

Submitted By: Konstantin J. Chernov
Committed By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1705099 13f79535-47bb-0310-9956-ffa450edef68
 2015-09-24 16:29:00 +00:00
Christophe Jaillet
9f3e627cb5 Silence a sparse warning about inconsistent indenting + some minor style issues 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1700331 13f79535-47bb-0310-9956-ffa450edef68
 2015-08-31 20:24:21 +00:00
Jeff Trawick
08a4db9f1a Follow-up to r1680895: 
Let %T be the format character which accepts time resolution
arguments.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1680942 13f79535-47bb-0310-9956-ffa450edef68
 2015-05-21 19:20:44 +00:00
Rainer Jung
940fae15d2 mod_log_config: instead of using the new dedicated 
pattern format "%M" for duration milliseconds,
overload the existing "%D" to choose the time precision
("%{s}D" for seconds, "%{ms}D" for milliseconds and
"%{us}D" for microseconds).

The existing %T and %D without precision are kept for
compatibility.

The previously introduced "%M" (r1677187) is removed,
it has not yet been released. Format pattern characters
are rare, so we should only use a new one if an
existing one isn't a good fit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1680895 13f79535-47bb-0310-9956-ffa450edef68
 2015-05-21 15:07:15 +00:00
Jeff Trawick
7b2bdeec88 const goodness 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1677489 13f79535-47bb-0310-9956-ffa450edef68
 2015-05-03 21:46:47 +00:00
Jan Kaluža
148417b8a7 * mod_journald: Remove JournaldCustomLog. It is not needed now when 
mod_log_config can use mod_journald as errorlog provider.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675797 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-24 06:56:43 +00:00
Jan Kaluža
38a56eedba * mod_journald: use -lsystemd instead of -lsystemd-journald when found 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675701 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-23 18:29:38 +00:00
Ben Reser
ba2b695cde mod_log_config: Fix a bug introduced by r1674261, when using a log provider 
the return of ap_default_log_writer was an uninitialized variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675534 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-23 03:18:52 +00:00
Ben Reser
ca8f9495c7 mod_log_config: Add %M format to output request duration in milliseconds. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1675533 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-23 03:12:30 +00:00
Jan Kaluža
438584b106 * mod_log_config: Allow using ErrorLog providers for CustomLog. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1674261 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-17 10:14:15 +00:00
Christophe Jaillet
3bf5f06197 Use 'unsigned int' in bitfield 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673113 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-13 05:59:26 +00:00
Eric Covener
ef2d04f0f3 allow time to first byte (of response headers) 
to be logged by mod_logio.  

mod_logio was just a conveninent place to do this 
w/o writing a new filter or complicating an existing 
important one.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671918 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-07 19:01:16 +00:00
Christophe Jaillet
27d1e6ea19 Fix style 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638188 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-11 15:40:06 +00:00
Christophe Jaillet
2785b009e9 Silent some cppcheck warnings. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1621806 13f79535-47bb-0310-9956-ffa450edef68
 2014-09-01 14:40:01 +00:00
Eric Covener
8cc5e00f9e *) SECURITY: CVE-2013-5704 (cve.mitre.org) 
core: HTTP trailers could be used to replace HTTP headers
     late during request processing, potentially undoing or
     otherwise confusing modules that examined or modified
     request headers earlier.  Adds "MergeTrailers" directive to restore
     legacy behavior.  

Submitted By: Edward Lu, Yann Ylavic, Joe Orton, Eric Covener
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610814 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-15 19:11:02 +00:00
Eric Covener
1a607a9914 Suggestion from Rick Houser -- for compatibility, pick an unusual 
character as the first character in a 2/3 character pattern.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610707 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-15 14:18:17 +00:00
Eric Covener
ef106e76be allow two character mod_log_config formats 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610686 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-15 13:30:59 +00:00
Jan Kaluža
f66a511609 mod_journald: New module implementing error_log provider for systemd-journald. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1610339 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 05:52:45 +00:00
Eric Covener
eae80e973c add GlobalLog directive to allow a diagnostic log to be inherited 
by all virtual hosts, even if they define their own logs.

Submitted By: Edward Lu <Chaosed0 gmail.com>
Committed by: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1599535 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 13:17:58 +00:00
William A. Rowe Jr
0559370e7e CVE-2014-0098 (reported by Rainer Canavan <rainer-apache 7val com>) 
Segfaults w/ truncated cookie logging.

Clean up the cookie logging parser to recognize only the cookie=value pairs,
not valueless cookies.  This refactors multiple passes over the same string
buffer into a single pass parser.

Submitted by: wrowe
Reviewed by: rpluem, jim 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575400 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-07 20:56:24 +00:00
William A. Rowe Jr
577eaf25cd Revert r1574518 to get 2.2/2.4/2.x all back in sync for a single fix 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1575394 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-07 20:45:33 +00:00
Jim Jagielski
82756fe342 ensure cookies have name/value 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1574518 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 15:00:56 +00:00
Jeff Trawick
30f8aa6460 more apr_file_write_full() simplification (like r1542413) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542416 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-15 22:03:16 +00:00
Jan Kaluža
452c223fe6 Add parse_errorlog_arg callback to ap_errorlog_provider to allow providers 
to check the ErrorLog argument. Implement this check in mod_syslog.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1541029 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-12 12:14:50 +00:00
Jeff Trawick
528855d544 Error log providers need to be able to trigger a startup error from their 
init() function.  A NULL return code is the trigger.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1527003 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-27 17:52:13 +00:00
Jan Kaluža
904b3f8d8b Add AP_ERRORLOG_PROVIDER_ADD_EOL_STR flag for ap_errorlog_provider, bump MMN. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525845 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-24 11:03:55 +00:00
Jeff Trawick
84d106dec4 allow the provider to decide whether or not APLOG_NOTICE 
messages should be logged


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525664 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 18:15:32 +00:00
Jan Kaluža
a4330cc11c mod_syslog: New module implementing syslog ap_error_log provider. 
Previously, this code was part of core, now it's in separate module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1525600 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-23 14:16:17 +00:00
Christophe Jaillet
4a9b30db53 Use %S instead of %C which already in use 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1517386 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-25 21:43:42 +00:00
Christophe Jaillet
d9e659b18f mod_logio: new format-specifier %C (combined) which is the sum of received and sent byte counts. PR54015 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484910 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-21 19:26:10 +00:00
Rainer Jung
9d0208a301 Fix crash in mod_log_config when logging 
request end time for a failed request
(LogFormat contains %{end}t).

The request_config for mod_log_config might
not be initialized.

PR 54828.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1467765 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-14 11:16:40 +00:00
Christophe Jaillet
b3f29e2bd8 Use ap_bin2hex instead of sprintf(..., "%02x". It gives the same output and is faster. 
No real speedup should be achieved on production machine, because this is done
only for characters that need to be escaped. 
However, this will close PR 50919.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1429564 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-06 18:08:46 +00:00
Stefan Fritsch
8a94c4aa9b style fixes, add comment 
no code change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1425360 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-22 22:29:06 +00:00
Gregg Lewis Smith
d559055384 Fix various clone/edit and search/replace errors 
in MSVC project files



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420975 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-12 21:14:57 +00:00