]>
granicus.if.org Git - apache/log
Rainer Jung [Tue, 31 Jan 2012 11:53:02 +0000 (11:53 +0000)]
definAtely
Backport of r1213381 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1238407 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 11:51:25 +0000 (11:51 +0000)]
silly indentation fix
Backport of r1203400 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1238406 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 11:46:48 +0000 (11:46 +0000)]
s/insure/ensure/
Backport of r1237407 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1238403 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 11:42:32 +0000 (11:42 +0000)]
configure: Move the --with-included-apr check so that srcdir!=builddir builds
aren't broken by it.
Backport of r1232838 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1238400 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 26 Jan 2012 19:15:41 +0000 (19:15 +0000)]
Merge r1236350 from trunk:
https also needs QS
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1236351 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 25 Jan 2012 20:28:50 +0000 (20:28 +0000)]
Restore attribution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1235916 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Jan 2012 20:06:07 +0000 (20:06 +0000)]
Add reference to CVE-2012-0021, quoting the 2.3.x version in which
the problem was introduced.
(following r1235875 which DidTRT for 2.2.x/CHANGES)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1235894 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jan 2012 16:51:31 +0000 (16:51 +0000)]
Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234895 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jan 2012 16:44:52 +0000 (16:44 +0000)]
Some doc updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234890 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 23 Jan 2012 16:16:55 +0000 (16:16 +0000)]
Merge r1234876:
Document how Include should behave. The present inconsistencies are now subject
of PR 52505 instead.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234878 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Jan 2012 15:24:46 +0000 (15:24 +0000)]
Merge r1234848 from trunk:
* server/core_filters.c (ap_core_output_filter): Don't read the entire
output of a morphing bucket into RAM.
Submitted by: jorton, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234854 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 23 Jan 2012 15:05:08 +0000 (15:05 +0000)]
SECURITY: CVE-2012-0053 (cve.mitre.org) Fix an issue in error responses that
could expose "httpOnly" cookies when no custom ErrorDocument is specified
for status code 400.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234838 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 23 Jan 2012 11:58:30 +0000 (11:58 +0000)]
remove mistakenly commited patches...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234755 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 23:37:06 +0000 (23:37 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234647 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 23:31:49 +0000 (23:31 +0000)]
Merge r1234643:
Fix docs for Include, add docs for IncludeOptional
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234646 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 23:30:14 +0000 (23:30 +0000)]
Merge r1234642:
Add a validate-xml target
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234645 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 18:52:37 +0000 (18:52 +0000)]
Merge r1234574:
ctx->bytes_in is never used. Remove a useless iteration through the brigade
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234576 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 18:51:29 +0000 (18:51 +0000)]
Merge r1234479:
Document the rather surprising code path on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234575 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 18:34:56 +0000 (18:34 +0000)]
Merge r1234180, r1234297, r1234565:
Make APACHE_MODULE() accept an optional prerequisite module for configure.
Introduce the following configure time dependencies:
mod_proxy_* (except proxy_html) require mod_proxy
mod_dav_* require mod_dav
mod_session_* require mod_session
mod_cache_disk requires mod_cache
mod_heartbeat requires mod_watchdog
PR: 52487
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234570 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 22 Jan 2012 18:13:14 +0000 (18:13 +0000)]
One more issue
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234564 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 21 Jan 2012 14:38:25 +0000 (14:38 +0000)]
Update copyrights for externally visible and changed code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234336 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 21 Jan 2012 09:08:56 +0000 (09:08 +0000)]
These deserve their place in httpd.conf on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234291 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 20 Jan 2012 19:02:53 +0000 (19:02 +0000)]
- Note new issues
- Module documentation is acceptable now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1234075 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 20 Jan 2012 13:02:28 +0000 (13:02 +0000)]
doc change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1233887 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 19 Jan 2012 22:41:55 +0000 (22:41 +0000)]
Merge r1233604 from trunk:
Adjust CVE-2011-3368/CVE-2011-4317 fixes to rely solely on
core's translate-name to fail unsupported URIs.
Rewrite and proxy now decline what they don't support rather
than fail the request.
Suggested by: trawick
Implemented by: jorton
Tweaked by: wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1233619 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 19 Jan 2012 22:32:09 +0000 (22:32 +0000)]
add entry for r1179239 (CVE-2011-3368)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1233611 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 19 Jan 2012 22:29:21 +0000 (22:29 +0000)]
add entry for r1209436 (CVE-2011-4317)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1233609 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Jan 2012 22:58:30 +0000 (22:58 +0000)]
Anticipate win32+win64
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232631 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 17 Jan 2012 22:49:22 +0000 (22:49 +0000)]
Further win32 edits anticipating 1.0.1-final is soon
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232623 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 17 Jan 2012 21:43:25 +0000 (21:43 +0000)]
Merge r1232594:
Reword the paragraph about --with-included-apr to mention the -deps
tarball.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232595 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 17 Jan 2012 21:35:34 +0000 (21:35 +0000)]
This is 2.4, not 2.3. And it's not a development version anymore.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232589 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 17 Jan 2012 21:17:24 +0000 (21:17 +0000)]
Backport:
configure: Improve the error message when --with-included-apr is specified
but either APR or APR-Util is not included.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232576 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 17 Jan 2012 14:08:41 +0000 (14:08 +0000)]
reformat CVE-2012-0031 to make consistent with other CVEs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232417 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 16 Jan 2012 23:21:40 +0000 (23:21 +0000)]
Backport:
RPM: Add mod_bucketeer, mod_case_filter and mod_case_filter_in to the RPM
spec file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232226 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 16 Jan 2012 17:35:39 +0000 (17:35 +0000)]
And we are at 2.4.1-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232071 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 16 Jan 2012 17:33:56 +0000 (17:33 +0000)]
Get ready to tag 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1232069 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 15 Jan 2012 22:47:37 +0000 (22:47 +0000)]
Update xforms, add missing mod_watchdog generated files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1231784 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 15 Jan 2012 22:35:13 +0000 (22:35 +0000)]
Merge r1229930:
More registered media types
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1231780 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 15 Jan 2012 02:05:18 +0000 (02:05 +0000)]
generated html and revision numbers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1231615 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 15 Jan 2012 02:04:16 +0000 (02:04 +0000)]
merge r1231607 from trunk
Submitted by: Daniel Shahaf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1231614 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 14 Jan 2012 07:47:09 +0000 (07:47 +0000)]
Merge r1231446from trunk:
Fix the request/response header error
Submitted by: INOUE Seiichiro <inoue ariel-networks.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1231453 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sat, 14 Jan 2012 06:49:17 +0000 (06:49 +0000)]
Merge r1229099 and r1231442 from trunk:
Fix XML validation error.
Add svn:keywords LastChangedRevision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1231443 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Jan 2012 22:24:22 +0000 (22:24 +0000)]
add compat info to CacheQuickHandler
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1230287 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 11 Jan 2012 22:21:24 +0000 (22:21 +0000)]
connect some the dots to 'CacheQuickHandler' in the CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1230283 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 11 Jan 2012 14:45:02 +0000 (14:45 +0000)]
Merge r1230065 from trunk (adapted to avoid MMN change):
SECURITY (CVE-2012-0031): Fix possible crash on shutdown if a child
changes the sb_type field in the scoreboard. Since unprivileged
children should not be able to affect the parent in this way, this is
treated as a Low severity security issue.
Thanks to "halfdog" <me halfdog.net> for reporting this issue.
* server/scoreboard.c (ap_cleanup_scoreboard, ap_create_scoreboard):
Use a static global to store an authoritative copy of the scoreboard
type.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1230069 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 9 Jan 2012 17:03:50 +0000 (17:03 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1229256 13f79535 -47bb-0310-9956-
ffa450edef68
Sander Temme [Mon, 9 Jan 2012 16:34:24 +0000 (16:34 +0000)]
Backport documentation updates for mod_heartbeat, mod_heartmonitor and mod_watchdog
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1229241 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 9 Jan 2012 16:07:37 +0000 (16:07 +0000)]
Merge r1229116 from trunk:
Add <glossary> to nroff.xsl and revert r1222335(r1222355) partially.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1229232 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 9 Jan 2012 15:30:14 +0000 (15:30 +0000)]
Fix English Revisions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1229207 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 9 Jan 2012 13:18:26 +0000 (13:18 +0000)]
Merge r1229134, r1229136:
Rename ap_func_attr_* macros to AP_FN_ATTR_*
Add macro for attribute alloc_size on newer gcc's
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1229139 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Mon, 9 Jan 2012 09:49:19 +0000 (09:49 +0000)]
Merge r1229059 from trunk:
Sync with 2.2 branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1229077 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 8 Jan 2012 16:59:44 +0000 (16:59 +0000)]
Merge r1228894 from trunk:
rewrite guesses URL or Filesystem in server context, but treats everything
as a URL in per-dir context.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1228895 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 8 Jan 2012 10:12:18 +0000 (10:12 +0000)]
merge r1228816 from trunk:
fix signedness issue with SSL_X509_NAME_to_string()'s maxlen argument
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1228817 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sun, 8 Jan 2012 01:40:36 +0000 (01:40 +0000)]
Merge r1228766 from trunk:
optimize this... Do strlen() ONLY if we need to check
for overflow.
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1228767 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jan 2012 18:15:28 +0000 (18:15 +0000)]
Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly
excluded from this cleanup as they must be signature identical to the
clib functions, and although the definition of size_t has been flakey,
the definition of those functions appears to be generally clean since
ANSI C.
Backports: r1228323
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1228324 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jan 2012 16:55:16 +0000 (16:55 +0000)]
Revert a premature bit of r1228262, part of size_t corrections part 2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1228264 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 6 Jan 2012 16:51:55 +0000 (16:51 +0000)]
Cure size_t abuse; Backport r1227856
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1228262 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jan 2012 15:47:08 +0000 (15:47 +0000)]
Merge r1227637, r1227642 from trunk:
restore the generic proxy workers to not being address-reusable.
The guts of mod_proxy is not really ready for the addr and host on a
proxy_conn_rec to change over time and differ from the 1 cached in the worker.
* proxy_worker->cp->addr needs to know what host/port it cached
* conn->addr and conn->hostname need to be allocated from their own subpool
so they can be cleared as they change
* ap_proxy_determine_connection needs to be more careful about which
addr is the TCP endpoint and what we have in either cache.
* may need to avoid updating the proxy_worker addr cache if we know
the value is flipping.
Update the comment and checks around address/connection reusability
in mod_proxy.
The checks and comment are a vestige of 2.0.x
mod_proxy_http where the backend proxy conn was stored in
the frontend r->conn_config, but ap_proxy_determine_connection()
doesn't associate the frontend and backend conns like this.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1227645 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 Jan 2012 20:39:07 +0000 (20:39 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1226941 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 3 Jan 2012 20:37:22 +0000 (20:37 +0000)]
Merge r1226603, r1226775 from trunk:
fill in the heartbeat modules' documentation.
add heartbeat to list of lb methods living in other modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1226940 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 2 Jan 2012 23:15:08 +0000 (23:15 +0000)]
s/2011/2012/g
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1226568 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 2 Jan 2012 17:20:11 +0000 (17:20 +0000)]
Merge r1226477 from trunk:
add/enhance some hints about configuration section merging (or lack of it in
the case of mod_access_compat)
PR52406
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1226481 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 2 Jan 2012 09:02:31 +0000 (09:02 +0000)]
Merge r1226375:
Add a bit of debug logging
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1226376 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 2 Jan 2012 04:20:47 +0000 (04:20 +0000)]
Merge r1226339:
Avoid using C++ reserved word 'new' in arg name in header
Doc tweaks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1226340 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 30 Dec 2011 11:03:17 +0000 (11:03 +0000)]
merge r1225796:
Sort list of modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225801 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 30 Dec 2011 11:02:30 +0000 (11:02 +0000)]
Merge r1225795:
Display all those shiny new hooks that we have in 2.4
Add new section "Other Hooks" for those that don't fit into "Startup Hooks"
or "Request Hooks"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225800 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Fri, 30 Dec 2011 10:42:16 +0000 (10:42 +0000)]
merge r1225791 from trunk:
Fix another case of #ifdef-within-a-macro (which was inadvertently
introduced a few days ago).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225792 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 29 Dec 2011 09:11:57 +0000 (09:11 +0000)]
Add changes entry for r1225477
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225481 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 29 Dec 2011 09:09:40 +0000 (09:09 +0000)]
Merge r1225478:
Document the unfortunate side effect of converting ap_log_*error into macros
with respect to #ifdef.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225479 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Thu, 29 Dec 2011 08:59:44 +0000 (08:59 +0000)]
Merge r1225476:
Don't use #ifdef inside macro calls
The behavior is undefined according to C99 6.10.3.11 and it breaks with
xlc on AIX
PR: 52394
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225477 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 28 Dec 2011 23:17:32 +0000 (23:17 +0000)]
Merge r1225380:
Fix segfault when trying to log a nameless valueless cookie
PR: 52256
Submitted by: Rainer Canavan <rainer-apache 7val com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225385 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 28 Dec 2011 15:00:28 +0000 (15:00 +0000)]
Merge r1225198:
Fix -DDUMP_RUN_CFG output for piped and syslog loggers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225202 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 28 Dec 2011 14:59:11 +0000 (14:59 +0000)]
Merge r1225197:
Adapt loglevel of config errors during second pass
Don't use APLOG_STARTUP since at that point, the error log is already
available. This gives us timestamps if these errors happen during graceful
restart.
Use level 'emerg' as these errors are fatal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225201 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Wed, 28 Dec 2011 00:37:01 +0000 (00:37 +0000)]
merge r1225060 from trunk:
Adjust the translations to r1223050 (Apache Tomcat link)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1225061 13f79535 -47bb-0310-9956-
ffa450edef68
Takashi Sato [Sun, 25 Dec 2011 06:57:44 +0000 (06:57 +0000)]
merge r1223048 from trunk:
Fix link to Apache Tomcat.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1223050 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 24 Dec 2011 07:34:07 +0000 (07:34 +0000)]
merge r1222930 from trunk:
add missing #ifdef in ssl_cmd_protocol_parse (should have been in r1222921)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222931 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 24 Dec 2011 06:59:14 +0000 (06:59 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222926 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 24 Dec 2011 06:43:48 +0000 (06:43 +0000)]
merge r1222921 from trunk:
SSLProtocol: allow explicit control of TLSv1.1 and TLSv1.2 flavors when
compiled against OpenSSL 1.0.1 or later. Update documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222922 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 24 Dec 2011 06:35:20 +0000 (06:35 +0000)]
merge r1222917 from trunk:
Set OPENSSL_NO_SSL_INTERN when compiling against OpenSSL 1.0.1
or later, so that mod_ssl retains binary compatibility with future
versions when internal structures are changed. Use API functions
where available, and fall back to direct access for OpenSSL up
to 1.0.0, where needed.
Remove SSL_make_ciphersuite() from ssl_util_ssl.[ch], as it was
never used by any released version of mod_ssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222920 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 24 Dec 2011 06:27:02 +0000 (06:27 +0000)]
merge r1222915 from trunk:
REMOTE_ADDR is now r->useragent_ip, which is not/never available at
SSL_CB_HANDSHAKE_DONE time. ap_log_cerror() already logs c->client_ip
for us, however, so we can simply drop REMOTE_ADDR from the message.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222916 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 23 Dec 2011 11:22:35 +0000 (11:22 +0000)]
Backport:
mod_mime: Don't arbitrarily bypass AddOutputFilter during a ProxyPass,
but then allow AddOutputFilter during a RewriteRule [P]. Make mod_mime
behave identically in both cases. PR52342.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222643 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Dec 2011 21:59:50 +0000 (21:59 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222479 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Dec 2011 21:58:54 +0000 (21:58 +0000)]
Backport:
Clarify how the filters are merged when defined using the AddOuputFilter
directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222477 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Dec 2011 17:14:58 +0000 (17:14 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222356 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 22 Dec 2011 17:13:51 +0000 (17:13 +0000)]
Build the man page for httxt2dbm.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1222355 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 20 Dec 2011 15:04:19 +0000 (15:04 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1221305 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Tue, 20 Dec 2011 15:03:50 +0000 (15:03 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1221304 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 20 Dec 2011 14:57:46 +0000 (14:57 +0000)]
Backport:
Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with
corresponding man pages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1221299 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 20 Dec 2011 11:55:03 +0000 (11:55 +0000)]
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
Graham Leggett [Mon, 19 Dec 2011 17:27:13 +0000 (17:27 +0000)]
Backport:
Distinguish properly between the bindir and sbindir directories when
installing binaries. Previously all binaries were silently installed to
sbindir, whether they were system administration commands or not.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220867 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 19 Dec 2011 17:16:51 +0000 (17:16 +0000)]
Backport:
Fix warning: variable 'rv' set but not used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220852 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 19 Dec 2011 17:07:24 +0000 (17:07 +0000)]
Backport:
RPM: Remove fiddling with installbuilddir, this is correct by default
through the use of config.layout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220848 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 19 Dec 2011 14:40:30 +0000 (14:40 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220776 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 19 Dec 2011 14:37:43 +0000 (14:37 +0000)]
Clarify which tarballs we are talking about.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220773 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 19 Dec 2011 02:52:07 +0000 (02:52 +0000)]
Backport.
Add further explanation on RPM packaging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220593 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 19 Dec 2011 02:49:54 +0000 (02:49 +0000)]
Add further explanation on RPM packaging.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220592 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 18 Dec 2011 20:29:23 +0000 (20:29 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220530 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 18 Dec 2011 20:26:48 +0000 (20:26 +0000)]
Backport:
Document the RPM platform.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220529 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 18 Dec 2011 18:02:21 +0000 (18:02 +0000)]
Various code cleanup to avoid compiler, cppcheck, or clang warnings:
modules/filters/mod_charset_lite.c: Remove dead assignments
modules/filters/mod_include.c: likewise
modules/metadata/mod_usertrack.c: likewise
modules/proxy/mod_proxy_ftp.c: likewise
modules/ssl/ssl_engine_pphrase.c: likewise
modules/proxy/mod_proxy_balancer.c: likewise;
Remove NULL check that can never happen
modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it
would, it would just mask another bug
os/unix/unixd.c: likewise
modules/http/http_filters.c: Remove sub-condition that is always true
modules/lua/mod_lua.c: Add default cases to switch statements
modules/generators/mod_autoindex.c: Unsigned value can never be < 0
server/util_expr_eval.c: Fix compiler warnings with VC and on OS2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220509 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 18 Dec 2011 18:00:14 +0000 (18:00 +0000)]
Merge r1220467:
Avoid segfault if url->hostname is NULL and filter->hostname is "*" or ".".
Found by clang.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1220508 13f79535 -47bb-0310-9956-
ffa450edef68