www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
26,964 Commits 62 Branches 306 Tags
d0fef61ba3a281ab044c7a8d9ead569ba0dc232f
Commit Graph

26964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rich Bowen
d0fef61ba3 Rebuild HTML docs 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673538 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 19:39:38 +00:00
Rich Bowen
2438ac6383 Clarify order of operations - some variables aren't accessible to If. 
See bz 53349 for context.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673535 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 19:37:47 +00:00
Rich Bowen
fc3cec123f Rebuild HTML 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673530 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 19:22:27 +00:00
Rich Bowen
9176c08239 Clarifies (I hope) what RewriteRule patterns are matched against. See 
bz53153 for context.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673528 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 19:19:01 +00:00
Rich Bowen
028db69df9 rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673523 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 19:08:14 +00:00
Rich Bowen
3200ef55cc Clarify regex so that it matches /icons or /icons/ but not /iconsFOO (as 
per bz53483


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673517 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 19:03:00 +00:00
Rich Bowen
605ec51c99 Clarifies FilesMatch and LocationMatch examples, as per bz53483 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673498 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 18:39:15 +00:00
Rich Bowen
099924fce5 rebuild html docs 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673490 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 18:25:58 +00:00
Rich Bowen
e7f9be5468 Clarifies both the regular expression and the explanation of it, to 
avoid unintentionally matching other things. (See bz 53483)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673487 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 18:19:57 +00:00
Rich Bowen
f4bcab7a8e Rebuild 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673475 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 17:20:42 +00:00
Rich Bowen
3458813d9b HTML encoding 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673472 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 17:12:00 +00:00
Rich Bowen
34e37f4fc1 Add "pre-compressed content" recipe, as per 
https://bz.apache.org/bugzilla/show_bug.cgi?id=51336


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673470 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 17:06:10 +00:00
Eric Covener
de91f95a16 libressl fix for removed ENGINE_CTRL_CHIL_SET_FORKCHECK 
Submitted By: Stuart Henderson <sthen openbsd.org>
Commited By: covener




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673455 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 15:56:30 +00:00
Christophe Jaillet
593715fd4a Remove some spaces between some return statements and ';' + fix a strange formating in a 'for' loop 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673368 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-14 06:03:13 +00:00
Jeff Trawick
2855063133 Fix CGIPassAuth built-in directive documentation, 
Get compatibility line in doc ready for backport

Pointed out by: rjung (who perhaps wasn't so positive about the eventual 2.4.x release)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673155 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-13 10:50:02 +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
Christophe Jaillet
5905e3ddec Add CHANGES entry before backport proposal 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672989 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-12 07:52:22 +00:00
Christophe Jaillet
2705372157 Tweak log message 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672985 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-12 06:57:07 +00:00
Lucien Gentis
9739f978a3 Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672890 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-11 16:38:34 +00:00
Jeff Trawick
028559818b mod_proxy_wstunnel isn't limited to Unix 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672757 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-10 20:35:59 +00:00
Rainer Jung
9c70146b34 More followon to r1671397 for proxy server-status 
in auto mode:
- remove remaining HTML markup


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672564 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-10 06:55:48 +00:00
Jeff Trawick
b23bd21d2c omit the period after the example lest it get copied 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672483 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-09 20:41:12 +00:00
Jeff Trawick
884cac22c0 SetEnv doesn't work for proxy-scgi-pathinfo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672480 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-09 20:38:17 +00:00
Rainer Jung
bc86b132b5 Followon to r1671397 for proxy server-status 
in auto mode:
- don't show HTML legend
- Show correct worker name


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672466 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-09 19:20:14 +00:00
Rainer Jung
837652cd3b Followon to r1671396: add misiing newline in 
new server-status output.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672453 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-09 18:59:43 +00:00
Rainer Jung
65c97d7d92 Followon to r1671396: 
Remove unwanted redundant output introduced
by that commit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672289 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-09 10:54:26 +00:00
Kaspar Brand
5a6a4b52ec UNSET the VirtualHost's LogLevel just before calling ap_merge_log_config(), 
to make sure that the DEFAULT_LOGLEVEL (APLOG_WARNING) is also in effect
when ap_process_config_tree() in main.c:main() walks through the
VirtualHost sections.

See https://mail-archives.apache.org/mod_mbox/httpd-dev/201404.mbox/%3C535CC85B.80501%40velox.ch%3E
for one case this is addressing. This reverts the change from r1024427 on
the one hand, but still ensures correct LogLevel merging on the other hand.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672014 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-08 07:33:39 +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
Yann Ylavic
8176d57223 CHANGES: remove entries merged into 2.4.x. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671419 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-05 19:22:24 +00:00
Rainer Jung
0c12000aed Add output for "?auto" version of server-status 
to proxy status, mod_ssl session cache info,
mod_cache_socache and the status hook of the
individual socache implementations.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671397 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-05 13:54:22 +00:00
Rainer Jung
0450264e71 Add more data to "?auto" view of server-status. 
Although mod_status source code calls this the
"short_report", the docs and the API flag call
it "Machine Readable" resp. "STAT_OPT_AUTO".
So IMHO the data shown should be on par with
the html version.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671396 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-05 13:34:01 +00:00
Rainer Jung
1379b31964 Followup to r1670431, 1670432, 1670440 
and 1670738: update max APLOGNO number.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671394 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-05 13:12:38 +00:00
Jeff Trawick
099f96e7f1 Mention the cmake/OpenSSL compatibility issue 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671364 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-05 01:10:37 +00:00
William A. Rowe Jr
33cfa9b34c Not that hard to explain... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670805 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-02 01:50:45 +00:00
Jim Jagielski
c33564090d Fix issue w/ deterministic ordering and string comparison of "http/1.1." and "h2" 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670738 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-01 17:18:59 +00:00
Graham Leggett
09c4bc62d0 http: Add support for RFC2324/RFC7168. 
Sample implementation: http://people.apache.org/~minfrin/mod_teapot.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670594 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-01 10:03:56 +00:00
Ruediger Pluem
cd82565218 * ssl_array_index is only used by code inside the HAVE_TLS_ALPN. So silence warnings if don't have it. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670578 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-01 08:34:31 +00:00
Jim Jagielski
abf1f3e23f And the lognos 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670440 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-31 19:23:11 +00:00
Rainer Jung
b2f953aa69 Revert r1670436. 
Patch was already applied, Jim was quicker.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670439 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-31 19:20:02 +00:00
Rainer Jung
71cf024446 Followup to r1670397+r1670434: even more ALPN goodness. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670436 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-31 19:15:32 +00:00
Jim Jagielski
7a99991874 More ALPN goodness 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670434 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-31 19:12:08 +00:00
Rainer Jung
31c3573052 Followup to r1670397: add missing APLOGNO. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670432 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-31 19:09:12 +00:00
Rainer Jung
bc41580632 Add missing APLOGNOs by running 
docs/log-message-tags/update-log-msg-tags.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670431 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-31 19:07:11 +00:00
Jim Jagielski
17565ac48c ALPN support, based on mod_spdy/mod_h2 patch set 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1670397 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-31 17:12:51 +00:00
Lucien Gentis
5524cbd29b Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669784 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-28 15:08:14 +00:00
Lucien Gentis
a09a09d24b XML update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669783 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-28 15:07:31 +00:00
Lucien Gentis
de160b50f9 Rebuild. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669781 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-28 15:04:42 +00:00
Lucien Gentis
816faa5152 XML updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669780 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-28 15:02:50 +00:00
William A. Rowe Jr
776ab659a6 Correct MS-DOS check-in crap on text files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669682 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-27 20:46:11 +00:00
Christophe Jaillet
6c3c048b7a s/apr_pstrndup/apr_pstrmemdup/ when applicable 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1669461 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-26 22:12:14 +00:00