]>
granicus.if.org Git - apache/log
Jim Jagielski [Thu, 17 Oct 2013 17:21:37 +0000 (17:21 +0000)]
typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1533170 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Oct 2013 17:21:04 +0000 (17:21 +0000)]
from an idea by Yann Ylavic <ylavic.dev@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1533169 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Oct 2013 16:54:53 +0000 (16:54 +0000)]
docco update now that we can support URL paths
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1533154 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Oct 2013 16:52:04 +0000 (16:52 +0000)]
move pool creation to the single instance when we need it...
but be pool aware anyway, just in case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1533153 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Oct 2013 15:24:44 +0000 (15:24 +0000)]
Only assume localhost in the special case where the person
just has the lone scheme after the |
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1533113 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Oct 2013 15:02:04 +0000 (15:02 +0000)]
ap_proxy_strncpy should correctly handle src being NULL.
Actually, apr_cpystrn() should as well...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1533100 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Oct 2013 14:10:43 +0000 (14:10 +0000)]
Put the uds path in its own field, and adjust the logic
to look for an empty string rather than a flag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1533087 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 17 Oct 2013 12:53:53 +0000 (12:53 +0000)]
Eclipse code analysis warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1533065 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Oct 2013 18:16:16 +0000 (18:16 +0000)]
axe svn:mime-type, add svn:eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532840 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Oct 2013 17:16:14 +0000 (17:16 +0000)]
add generated files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532822 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Oct 2013 17:12:57 +0000 (17:12 +0000)]
generated files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532819 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Oct 2013 17:11:29 +0000 (17:11 +0000)]
Interpolation worked within the scheme portion of URLs for
ProxyPass and ProxyPassReverse until a fix to apr_uri_parse()
in APR-Util 1.5.2 closed the hole that had previously allowed
the necessary {} characters within the scheme.
Lack of support for interpolation within the scheme will be a
permanent limitation.
The mod_proxy documentation is updated to provide an alternate
configuration solution.
PR: 55315
Submitted by: Mike Rumph <mike.rumph oracle.com>
Tweaked by: trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532816 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 16 Oct 2013 12:21:49 +0000 (12:21 +0000)]
No more magic numbers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532746 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Oct 2013 20:02:30 +0000 (20:02 +0000)]
don't use what could have been freed...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532507 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Oct 2013 17:45:47 +0000 (17:45 +0000)]
Update LOGNO
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532456 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Oct 2013 16:03:26 +0000 (16:03 +0000)]
in 2.4.7
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532405 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Oct 2013 15:58:37 +0000 (15:58 +0000)]
docco userland change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532403 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Oct 2013 15:45:30 +0000 (15:45 +0000)]
xforms update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532397 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 15 Oct 2013 15:38:09 +0000 (15:38 +0000)]
Standardize on:
unix:/path/to/socket|scheme://ignored
for ProxyPass UDS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532394 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 15 Oct 2013 14:09:29 +0000 (14:09 +0000)]
Follow-up to r1525597:
Initialize error log providers in vhosts, solving crashes
when logging from those vhosts as well as allowing a different
provider (or provider configuration) for vhosts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532344 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 15 Oct 2013 11:19:38 +0000 (11:19 +0000)]
* support/rotatelogs.c (get_now): Fix the NULL ptr dereferences
added in r1532281.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532289 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 15 Oct 2013 10:44:17 +0000 (10:44 +0000)]
* support/rotatelogs.c (get_now): Return the offset applied to the
Unix time as a parameter.
(doRotate): When exploding the time for strtfime formatting, iff in
-l mode, subtract the offset and explode the real Unix time as a
local time so %Z etc works correctly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532281 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 14 Oct 2013 22:51:44 +0000 (22:51 +0000)]
avoid needless apr_pstrdup()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1532122 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Oct 2013 16:38:52 +0000 (16:38 +0000)]
check that we have a pool...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531971 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Oct 2013 16:31:17 +0000 (16:31 +0000)]
Just use the def global... consistency is important
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531969 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Oct 2013 16:12:30 +0000 (16:12 +0000)]
Ensure that userland format of UDS is the same as how it is
configured, no matter how we store and use it internally.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531962 13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Mon, 14 Oct 2013 16:08:41 +0000 (16:08 +0000)]
Support optional initialization arguments for socache providers in
mod_authn_socache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531961 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Oct 2013 15:03:05 +0000 (15:03 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531934 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Oct 2013 15:02:50 +0000 (15:02 +0000)]
IDE typo error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531933 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Oct 2013 14:59:40 +0000 (14:59 +0000)]
Update doccos about UDS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531930 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 14 Oct 2013 14:59:38 +0000 (14:59 +0000)]
clean up socket definition... just the sock: path matters,
and we adjust relative to DefaultRuntimeDir
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531929 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 13 Oct 2013 13:07:19 +0000 (13:07 +0000)]
mod_session: Reset the max-age on session save. PR 47476.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531683 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 13 Oct 2013 12:27:54 +0000 (12:27 +0000)]
mod_session: After parsing the value of the header specified by the
SessionHeader directive, remove the value from the response. PR 55279.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531679 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 13 Oct 2013 12:14:39 +0000 (12:14 +0000)]
mod_auth_form: Make sure the optional functions are loaded even when
the AuthFormProvider isn't specified.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531672 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 12 Oct 2013 15:03:05 +0000 (15:03 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531538 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Sat, 12 Oct 2013 06:13:20 +0000 (06:13 +0000)]
Followup to r1529559: mod_dav_fs: Fix encoding of hrefs in PROPFIND response.
Previous commit missed encoding the names of the children of the PROPFIND
request when the depth wasn't 0.
* modules/dav/fs/repos.c
(dav_fs_append_uri): New function
(dav_fs_walker): Use dav_fs_append_uri() and adjust length calculations to
use the encoded length.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531505 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 11 Oct 2013 17:36:24 +0000 (17:36 +0000)]
syntax sugar... if the worker is associated w/ a UDS,
then make sure the log reporting has a visual clue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531370 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 11 Oct 2013 16:12:41 +0000 (16:12 +0000)]
Reformat the UDS support inline with a new naming structure.
Use a flag for speed for testing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1531340 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 9 Oct 2013 22:22:17 +0000 (22:22 +0000)]
save a possible lookup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1530813 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 9 Oct 2013 21:09:41 +0000 (21:09 +0000)]
core: Don't truncate output when sending is interrupted by a signal,
such as from an exiting CGI process.
PR: 55643
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1530793 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 9 Oct 2013 21:08:55 +0000 (21:08 +0000)]
follow-up to r1530603: fix typo/syntax error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1530792 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 9 Oct 2013 13:38:45 +0000 (13:38 +0000)]
ping tuning via Yann Ylavic <ylavic.dev@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1530603 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 9 Oct 2013 07:15:29 +0000 (07:15 +0000)]
Break long lines.
Add missing <code></code>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1530514 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 8 Oct 2013 17:21:27 +0000 (17:21 +0000)]
Add no's
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1530361 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 8 Oct 2013 06:03:48 +0000 (06:03 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1530161 13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Mon, 7 Oct 2013 16:14:39 +0000 (16:14 +0000)]
Correct typo in comments for ap_map_http_request_error().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529991 13f79535 -47bb-0310-9956-
ffa450edef68
Chris Darroch [Mon, 7 Oct 2013 16:10:07 +0000 (16:10 +0000)]
Correct typo in comments for ap_map_http_request_error().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529988 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Sun, 6 Oct 2013 01:08:51 +0000 (01:08 +0000)]
Fix PR 55397: dav_resource->uri treated as an unparsed uri.
The change made for PR 54611 caused this field to be treated as
unescaped. mod_dav_svn however, provided escaped URIs. Essentially
breaking support for paths with non-URI safe characters in SVN.
Adjust the code so that dav_resource->uri is assumed to be escaped and
adjust mod_dav_fs so that it uses escaped URIs in this field.
* modules/dav/fs/repos.c
(dav_fs_get_resource): Use the unparsed_uri to contruct the resource uri.
* modules/dav/main/mod_dav.c
(dav_xml_escape_uri): Do not uri escape, just handle xml escaping.
(dav_created): Assume that locn if provided is escaped.
(dav_method_copymove, dav_method_bind): Use the unparsed_uri on the request
when calling dav_created() to adjust to locn assuming it is escaped.
* modules/dav/main/mod_dav.h
(dav_resource): Document that uri is escaped.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529559 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 5 Oct 2013 13:49:22 +0000 (13:49 +0000)]
When building modules with prereqs, search httpd include dirs
before prereq include dirs in case httpd is installed to the same
place as the prereq, in which case we might be using an older
httpd .h file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529452 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 5 Oct 2013 13:14:36 +0000 (13:14 +0000)]
ap_rputs() silently truncated size_t to int, resulting in 130+ warnings
when building httpd and a rich set of modules on Windows.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529449 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Oct 2013 13:09:18 +0000 (13:09 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529447 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 5 Oct 2013 12:44:36 +0000 (12:44 +0000)]
Disable event/eventopt if apr skiplist isn't available
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529442 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 5 Oct 2013 12:11:58 +0000 (12:11 +0000)]
skiplist is gone
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529440 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 4 Oct 2013 20:03:50 +0000 (20:03 +0000)]
WebSocket support requires Winsock2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529277 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 21:50:07 +0000 (21:50 +0000)]
core: Add missing Reason-Phrase in HTTP response headers.
PR 54946.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1529014 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 3 Oct 2013 19:00:03 +0000 (19:00 +0000)]
Remove backported items from CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528972 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Thu, 3 Oct 2013 05:29:35 +0000 (05:29 +0000)]
mod_dav: Fix PR 55306.
Makes mod_dav no longer require that the lock token be provided when the
source of a COPY is locked. The prior behavior was in violating of
RFC 4918 which says that the lock token is only required on resources
that may be modified by the method.
* modules/dav/main/mod_dav.h
(DAV_VALIDATE_NO_MODIFY): New flag to be passed to dav_validate_* functions.
* modules/dav/main/mod_dav.c
(dav_method_copymove): Use the new flag when calling dav_validate_request()
on the COPY source.
* modules/dav/main/util.c
(dav_validate_resource_state): Use the flag to decide to ignore if the lock
token is not provided.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528718 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Oct 2013 16:38:39 +0000 (16:38 +0000)]
*) mod_rewrite: Make rewrite websocket aware to allow proxying.
PR 55598. [Chris Harris <chris.harris kitware com>]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528556 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 2 Oct 2013 12:12:36 +0000 (12:12 +0000)]
skiplist is now in apr 1.5 and above
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528437 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Tue, 1 Oct 2013 17:30:45 +0000 (17:30 +0000)]
add attribution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528155 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 1 Oct 2013 16:41:37 +0000 (16:41 +0000)]
Don't use a hardcoded cn=* in case the subgroup has no CN.
Submitted By: David Hawes <dhawes vt.edu>
Committed By: Eric Covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528143 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 1 Oct 2013 11:53:10 +0000 (11:53 +0000)]
in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528054 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 1 Oct 2013 10:28:29 +0000 (10:28 +0000)]
* build/config_vars.sh.in: Trim more stuff from installed config_vars.mk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528035 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 1 Oct 2013 10:25:02 +0000 (10:25 +0000)]
Don't link support/* against systemd libs.
* Makefile.in: Link httpd using $(HTTPD_LIBS).
* configure.in: Add systemd to HTTPD_LIBS rather than LIBS. Add PCRE
libs to HTTPD_LIBS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528034 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 1 Oct 2013 10:15:12 +0000 (10:15 +0000)]
* configure.in: Simplify/fix systemd detection: move later to fix
autoconf warnings; define HAVE_SYSTEMD rather than using CPPFLAGS.
* server/listen.c: Use HAVE_SYSTEMD for systemd #define.
* modules/arch/unix/config5.m4: Update systemd headers check.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1528032 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Tue, 1 Oct 2013 06:25:35 +0000 (06:25 +0000)]
PR 55616 (add missing APLOGNO), part 2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527926 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Tue, 1 Oct 2013 06:24:29 +0000 (06:24 +0000)]
PR 55616 (add missing APLOGNO), part 1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527925 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 30 Sep 2013 13:56:20 +0000 (13:56 +0000)]
Follow up to r1527295:
ssl_engine_dh.c is still in 2.4.x, and (perhaps unexpectedly) this
cmake list supports both trunk and 2.4.x for the time being.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527570 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Mon, 30 Sep 2013 10:35:52 +0000 (10:35 +0000)]
mod_dav: set r->status_line in dav_error_response.
It's used as argument in next ap_rvputs call. PR 55426.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527509 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 29 Sep 2013 10:41:52 +0000 (10:41 +0000)]
update transformations for mod_ssl and ssl_faq
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527296 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 29 Sep 2013 10:35:46 +0000 (10:35 +0000)]
Improve ephemeral key handling (companion to r1526168):
- allow to configure custom DHE or ECDHE parameters via the
SSLCertificateFile directive, and adapt its documentation
accordingly (addresses PR 49559)
- add standardized DH parameters from RFCs 2409 and 3526,
use them based on the length of the certificate's RSA/DSA key,
and add a FAQ entry for clients which limit DH support
to 1024 bits (such as Java 7 and earlier)
- move ssl_dh_GetParamFromFile() from ssl_engine_dh.c to
ssl_util_ssl.c, and add ssl_ec_GetParamFromFile()
- drop ssl_engine_dh.c from mod_ssl
For the standardized DH parameters, OpenSSL version 0.9.8a
or later is required, which was therefore made a new minimum
requirement in r1527294.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527295 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 29 Sep 2013 10:12:47 +0000 (10:12 +0000)]
Increase minimum required OpenSSL version to 0.9.8a (in preparation
for the next mod_ssl commit, which will rely on the get_rfcX_prime_Y
functions added in that release):
- remove obsolete #defines / macros
- in ssl_private.h, regroup definitions based on whether
they depend on TLS extension support or not
- for ECC and SRP support, set HAVE_X and change the rather awkward
#ifndef OPENSSL_NO_X lines accordingly
For the discussion prior to taking this step, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%
3C524275C7 .
9060408 %40velox.ch%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527294 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 29 Sep 2013 09:36:31 +0000 (09:36 +0000)]
Follow-up fixes for r1526168:
- drop SSL_TMP_KEY_* constants from ssl_private.h, too
- make sure we also disable aNULL, eNULL and EXP ciphers
for per-directory SSLCipherSuite directives
- apply the same treatment to SSLProxyCipherSuite
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527291 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 28 Sep 2013 19:14:25 +0000 (19:14 +0000)]
Follow up to r1526666:
Use SYNCHRONIZE instead of PROCESS_ALL_ACCESS because
a. it is sufficient
b. it avoids an issue where PROCESS_ALL_ACCESS is larger on
newer SDKs, resulting in a run-time error when running on
older Windows
Close the handle.
Submitted by: Ivan Zhakov <ivan visualsvn.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527220 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Sep 2013 15:22:23 +0000 (15:22 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527200 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 28 Sep 2013 11:11:14 +0000 (11:11 +0000)]
Axe the README a bit, add fuankg as contributor. This will need a complete rewrite at some point.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527172 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 27 Sep 2013 20:30:47 +0000 (20:30 +0000)]
r1526906 followup:
error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527063 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 27 Sep 2013 18:01:15 +0000 (18:01 +0000)]
Fix the null device name on Windows so that stderr can be sent
to the bit bucket. (This logic is always hit when using an error
log provider.)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527008 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 27 Sep 2013 17:55:00 +0000 (17:55 +0000)]
When adding APR_EOL_STR in the error log record before calling
the writer, include that trailer in the length.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1527005 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 27 Sep 2013 17:52:13 +0000 (17:52 +0000)]
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
Daniel Gruno [Fri, 27 Sep 2013 13:56:53 +0000 (13:56 +0000)]
mod_lua: Use a (new) global pool/mutex setup for IVM rather than a per-process pool.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526906 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 26 Sep 2013 20:08:33 +0000 (20:08 +0000)]
WinNT MPM: Exit the child if the parent process crashes or is terminated.
Submitted by: Oracle, via trawick
The original modification was made some years ago for Oracle HTTP Server
by an Oracle employee. trawick made additional changes for style and
for trunk/2.4.x changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526666 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 26 Sep 2013 19:14:39 +0000 (19:14 +0000)]
allow building mod_authnz_fcgi with 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526647 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 26 Sep 2013 19:06:05 +0000 (19:06 +0000)]
util_fcgi.c now in 2.4.x branch too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526643 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 26 Sep 2013 14:03:31 +0000 (14:03 +0000)]
arrange previous fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526499 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 26 Sep 2013 13:11:15 +0000 (13:11 +0000)]
Follow-up to r1526436: Fix compilation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526473 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 26 Sep 2013 11:13:52 +0000 (11:13 +0000)]
remove entry for r1525931 (APLOG_STARTUP with ErrorLogFormat), now
in 2.4.x branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526443 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 26 Sep 2013 11:08:27 +0000 (11:08 +0000)]
minor edits
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526441 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 26 Sep 2013 09:56:41 +0000 (09:56 +0000)]
Fix for PR 54626.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526436 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Sep 2013 16:23:28 +0000 (16:23 +0000)]
worker MPM: Don't forcibly kill worker threads if the child process is
exiting gracefully.
Submitted by: Oracle, via trawick
This modification was made some years ago for Oracle HTTP Server
by an Oracle employee.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526220 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 25 Sep 2013 14:29:02 +0000 (14:29 +0000)]
mod_proxy: Add ap_connection_reusable() for checking if a connection
is reusable as of this point in processing.
mod_proxy_fcgi uses the new API to determine if FCGI_CONN_CLOSE
should be enabled, but that doesn't change existing behavior
since the connection is currently marked for closure elsewhere
in the module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526189 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 25 Sep 2013 12:59:59 +0000 (12:59 +0000)]
meanwhile in 2.4.6 and 2.2.25, respectively
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526169 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 25 Sep 2013 12:52:35 +0000 (12:52 +0000)]
Streamline ephemeral key handling:
- drop support for ephemeral RSA keys (only allowed/needed
for export ciphers)
- drop pTmpKeys from the per-process SSLModConfigRec, and remove
the temp key generation at startup (unnecessary for DHE/ECDHE)
- unconditionally disable null and export-grade ciphers by always
prepending "!aNULL:!eNULL:!EXP:" to any cipher suite string
- do not configure per-connection SSL_tmp_*_callbacks, as it is
sufficient to set them for the SSL_CTX
- set default curve for ECDHE at startup, obviating the need
for a per-handshake callback, for the time being (and also
configure SSL_OP_SINGLE_ECDH_USE, previously left out)
For additional background, see
https://mail-archives.apache.org/mod_mbox/httpd-dev/201309.mbox/%
3C52358ED1 .
2070704 @velox.ch%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1526168 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 24 Sep 2013 15:57:07 +0000 (15:57 +0000)]
Suppress formatting of startup messages written to the console when
ErrorLogFormat is used.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1525931 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 24 Sep 2013 12:14:57 +0000 (12:14 +0000)]
Change the default value of AuthLDAPMaxSubGroupDepth, so sub-group searching
is opt-in. Not intended for 2.4 backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1525866 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 24 Sep 2013 11:03:55 +0000 (11:03 +0000)]
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
Jeff Trawick [Mon, 23 Sep 2013 18:15:32 +0000 (18:15 +0000)]
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
Jan Kaluža [Mon, 23 Sep 2013 14:16:17 +0000 (14:16 +0000)]
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
Jan Kaluža [Mon, 23 Sep 2013 14:02:27 +0000 (14:02 +0000)]
Add ap_errorlog_provider to make ErrorLog logging modular. Move
syslog support from core to new mod_syslog.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1525597 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 23 Sep 2013 13:42:06 +0000 (13:42 +0000)]
add a note about sub-group searching and large groups.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1525588 13f79535 -47bb-0310-9956-
ffa450edef68