1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

25308 Commits

Author SHA1 Message Date
Lucien Gentis
ce430a69ee Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531538 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 15:03:05 +00:00
Ben Reser
31a3eab6d7 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
2013-10-12 06:13:20 +00:00
Jim Jagielski
0605393196 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
2013-10-11 17:36:24 +00:00
Jim Jagielski
e40e0a785b 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
2013-10-11 16:12:41 +00:00
Jim Jagielski
13af10453a save a possible lookup
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530813 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 22:22:17 +00:00
Jeff Trawick
b299ff2e98 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
2013-10-09 21:09:41 +00:00
Jeff Trawick
ec6996c38d 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
2013-10-09 21:08:55 +00:00
Jim Jagielski
6284650f6d 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
2013-10-09 13:38:45 +00:00
Christophe Jaillet
b7924d7645 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
2013-10-09 07:15:29 +00:00
Jim Jagielski
6dd580a163 Add no's
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530361 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 17:21:27 +00:00
Christophe Jaillet
fb96deae58 Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1530161 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 06:03:48 +00:00
Chris Darroch
151a95ae46 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
2013-10-07 16:14:39 +00:00
Chris Darroch
3f864213bc 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
2013-10-07 16:10:07 +00:00
Ben Reser
4de0b69f7f 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
2013-10-06 01:08:51 +00:00
Jeff Trawick
bc8495dba1 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
2013-10-05 13:49:22 +00:00
Jeff Trawick
1ce3115aab 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
2013-10-05 13:14:36 +00:00
Lucien Gentis
c2c75f9172 Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529447 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 13:09:18 +00:00
Jeff Trawick
2bd622626f 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
2013-10-05 12:44:36 +00:00
Jeff Trawick
6fb8a4ad86 skiplist is gone
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529440 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 12:11:58 +00:00
Gregg Lewis Smith
bd643bdfb6 WebSocket support requires Winsock2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1529277 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 20:03:50 +00:00
Rainer Jung
6a76621f9f 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
2013-10-03 21:50:07 +00:00
Rainer Jung
04830237c5 Remove backported items from CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528972 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 19:00:03 +00:00
Ben Reser
3c6d4757a1 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
2013-10-03 05:29:35 +00:00
Jim Jagielski
ef357793f4 *) 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
2013-10-02 16:38:39 +00:00
Jim Jagielski
898365fd1d 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
2013-10-02 12:12:36 +00:00
Kaspar Brand
22ac3c32be add attribution
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528155 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 17:30:45 +00:00
Eric Covener
650526b07a 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
2013-10-01 16:41:37 +00:00
Jim Jagielski
1cefd42953 in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1528054 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 11:53:10 +00:00
Joe Orton
db365dce9b * 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
2013-10-01 10:28:29 +00:00
Joe Orton
c19caf3219 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
2013-10-01 10:25:02 +00:00
Joe Orton
f6f568d30c * 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
2013-10-01 10:15:12 +00:00
Kaspar Brand
2aa439bdec 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
2013-10-01 06:25:35 +00:00
Kaspar Brand
31156ac269 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
2013-10-01 06:24:29 +00:00
Jeff Trawick
c43ffe3907 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
2013-09-30 13:56:20 +00:00
Jan Kaluža
79f70135fb 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
2013-09-30 10:35:52 +00:00
Kaspar Brand
59f903858e 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
2013-09-29 10:41:52 +00:00
Kaspar Brand
169f992d89 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
2013-09-29 10:35:46 +00:00
Kaspar Brand
725978c554 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
2013-09-29 10:12:47 +00:00
Kaspar Brand
056e10bb4f 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
2013-09-29 09:36:31 +00:00
Jeff Trawick
df246e149e 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
2013-09-28 19:14:25 +00:00
Lucien Gentis
fe341032f6 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1527200 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 15:22:23 +00:00
Daniel Gruno
85e297e619 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
2013-09-28 11:11:14 +00:00
Eric Covener
a8ad7b0e63 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
2013-09-27 20:30:47 +00:00
Jeff Trawick
86b710bb80 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
2013-09-27 18:01:15 +00:00
Jeff Trawick
f89aa5c2a2 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
2013-09-27 17:55:00 +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
Daniel Gruno
5a2ba0a377 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
2013-09-27 13:56:53 +00:00
Jeff Trawick
90289779b6 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
2013-09-26 20:08:33 +00:00
Jeff Trawick
c4b92f3f89 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
2013-09-26 19:14:39 +00:00
Jeff Trawick
1333941c70 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
2013-09-26 19:06:05 +00:00