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

22870 Commits

Author SHA1 Message Date
Rich Bowen
d07cd29c3c Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299330 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 02:46:48 +00:00
Rich Bowen
5bbb2ccb30 Correct link to sed docs. Via Daniel Gruno
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299328 13f79535-47bb-0310-9956-ffa450edef68
2012-03-11 02:45:26 +00:00
Rich Bowen
9d312d3890 Rebuild various
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299012 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 19:57:26 +00:00
Rich Bowen
87537431ee Fix broken link to sed docs. via Daniel Gruno <rumble AT cord DOT dk>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1299011 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 19:55:11 +00:00
Jim Jagielski
e7fdd879a7 Use new ap_runtime_dir_relative() API
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298433 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 15:40:42 +00:00
Jim Jagielski
deab2b5786 Bump
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298432 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 15:40:40 +00:00
Igor Galić
5bb6406dd7 pr#52852 remove Require all granted from example, it breaks otherwise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298353 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 11:04:47 +00:00
Rich Bowen
c6c2b6b94c Outdated translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298257 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 02:02:40 +00:00
Rich Bowen
c058932d0f mod_proxy_html is no longer a third-party module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1298256 13f79535-47bb-0310-9956-ffa450edef68
2012-03-08 02:02:09 +00:00
Jim Jagielski
29d868dd69 docco updates w/ xfrms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297960 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 12:53:37 +00:00
Jim Jagielski
25c27c59dd Docs (and minor comment change) for DefaultRuntimeDir directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297959 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 12:51:04 +00:00
Eric Covener
7ab4cfe81a PR52845: "DirectoryIndex disabled" should blow away the DirectoryIndex settings
in the current config section, not just override previous config sections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297958 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 12:42:09 +00:00
Jim Jagielski
4be5546b87 Revert... wtf did this come from??
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297956 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 12:35:10 +00:00
Jim Jagielski
fc1b444d2e Fold on Jeff's DefaultRuntimeDir impl... docs on the way
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297955 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 12:31:58 +00:00
Rich Bowen
5f545146f6 Trivial s/a/an/ typo correction.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297835 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 02:08:52 +00:00
Jim Jagielski
04ed74941a Allow for DEFAULT_REL_RUNTIMEDIR ala socache... prevent perm issues
with some configs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297560 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 16:20:17 +00:00
Rich Bowen
738605a5ce Rebuild variant files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297488 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 14:13:08 +00:00
Igor Galić
4a5264e87f rebuild transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297487 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 14:10:37 +00:00
Igor Galić
810e72f6e2 Fix link for User/Group. Credit: Humbedooh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1297485 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 14:07:36 +00:00
Rich Bowen
3ef652f24f Rebuild a bunch of transformations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296926 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 01:27:45 +00:00
Rich Bowen
60ad8421de Modules get installed to ./modules not ./libexec
(https://issues.apache.org/bugzilla/show_bug.cgi?id=52454)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296923 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 01:26:38 +00:00
Rich Bowen
226a8a6ec4 Note that with wildcard certs, or serverAltName certs, no special
workarounds are needed. (viz https://issues.apache.org/bugzilla/show_bug.cgi?id=51746 )


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296919 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 01:09:47 +00:00
Rich Bowen
87d5ae28a7 The referenced Makefile no longer exists, since mod_ssl is no longer a
separate distribution. If someone would like to provide more detail
here, that would be great. This is in response to
https://issues.apache.org/bugzilla/show_bug.cgi?id=49562


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296911 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 00:37:27 +00:00
Sander Temme
5f084edaa9 Merge note about now-external APR dependency from 2.4 branch, and add note about PCRE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296735 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 00:44:35 +00:00
Rich Bowen
5bd958d1a0 Rebuild transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296730 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 00:23:15 +00:00
Lucien Gentis
9df5dcc38d Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296683 13f79535-47bb-0310-9956-ffa450edef68
2012-03-03 19:35:05 +00:00
Stefan Fritsch
5d9207c78c Fix insecure handling of LD_LIBRARY_PATH that could lead to the
current working directory to be searched for DSOs

CVE-2012-0883


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296428 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 20:06:34 +00:00
Rich Bowen
77d9a99e84 Correct the statement of how query string ordering works with the QSA
flag. Change via nathan.deklepper AT objectconsulting.com.au,
https://issues.apache.org/bugzilla/show_bug.cgi?id=52689


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296175 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 12:52:47 +00:00
Rich Bowen
b3813c0968 Adds Korean index page for FAQs, and links to it from other languages.
From 윤병조 <yunbj AT naver DOT com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296168 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 12:26:41 +00:00
Rich Bowen
940236f629 Rename file and fix markup errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296167 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 12:25:18 +00:00
Rich Bowen
1236fa1d37 Adds Korean translation of FAQ index. Contributed by 윤병조 <yunbj AT naver DOT com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1296166 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 12:16:18 +00:00
Rich Bowen
012c3fa902 Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1295297 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 21:40:36 +00:00
Rich Bowen
848955a068 Fix directive name in doc as per https://issues.apache.org/bugzilla/show_bug.cgi?id=52798
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1295291 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 21:31:22 +00:00
Jeff Trawick
a1f372edf2 Fix MPM DSO load failure on AIX.
Without the proper AP_DECLARE*, these functions used by MPMs
were not exported from httpd on AIX, resulting in symbol
resolution errors.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294936 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 01:52:17 +00:00
Kaspar Brand
ec3dcc172f properly free the GENERAL_NAMEs, as pointed out in PR 32652
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294471 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 06:01:23 +00:00
Graham Leggett
e06efbc200 AIX: Add missing build scripts.
Submitted by: Michael Felt <mamfelt gmail com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294372 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 22:31:32 +00:00
Graham Leggett
59abd5dc83 AIX: Update the build to support AIX packages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294367 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 22:24:18 +00:00
Stefan Fritsch
d6e62d6f04 Add the port number to the vhost's name in the scoreboard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294358 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 22:08:52 +00:00
Stefan Fritsch
7a8f5c88aa Take care not to call ap_start_lingering_close from the listener thread,
because it may block when flushing data to the client.

From the listener thread, do a lingering close without flushing. This is
OK because we only do this if there has been an error during write
completion or if our send buffers are empty because we are in keep-alive.

PR: 52229


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294356 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 22:04:54 +00:00
Stefan Fritsch
44e83509b3 Prevent listener thread from ever updating a worker's scoreboard slot
The worker may be doing something else by now. This should take
care of slots staying in "L" state in the scoreboard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294349 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 21:45:18 +00:00
Stefan Fritsch
960f0a63cd Initialize EC temporary key on server startup, as for DH and
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1294306 13f79535-47bb-0310-9956-ffa450edef68
2012-02-27 20:01:40 +00:00
Stefan Fritsch
ac4effde8d Pass the EOS bucket down the filter chain
PR: 52766


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293717 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 22:51:33 +00:00
Stefan Fritsch
a1cbd5ddfb Enable per-module loglevel for mod_xml2enc and mod_proxy_html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293708 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 22:15:42 +00:00
Graham Leggett
5965fdd1f3 Add a section to the mod_session documentation that better describes how to integrate
applications with mod_session.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293678 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 20:32:29 +00:00
Graham Leggett
720f5f4e43 mod_session: Sessions are encoded as application/x-www-form-urlencoded strings, however we
do not handle the encoding of spaces properly. Fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293658 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 18:10:56 +00:00
Lucien Gentis
710038a3c5 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293650 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 16:59:06 +00:00
Stefan Fritsch
cba7493ed6 Fix another compiler warning
Submitted by: Daniel Shahaf <danielsh elego de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293535 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 05:30:43 +00:00
Stefan Fritsch
ea8cd427b2 Fix compiler warning
Submitted by: Daniel Shahaf <danielsh elego de>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293534 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 05:28:11 +00:00
Stefan Fritsch
f36eefcf6f Fix MMN in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293427 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 21:27:37 +00:00
Stefan Fritsch
f6cf165a16 Revert Paul's lock free circular queue changes done on MPM-event.
The changes have been moved to branches/mpm-event-optimization.

This puts trunk's MPM-event back to the state of 2.4.x, except for serf
support.

The following commits are reverted:
 ------------------------------------------------------------------------
r1203404 | trawick | 2011-11-17 23:48:35 +0100

event no longer requires APR_POLLSET_THREADSAFE, or any
other non-standard feature (all but OS/2 have APR_POLLSET_WAKEABLE)

config-foo: don't require thread-safe pollset in order to
            build event

event.c: don't stress APR_ENOTIMPL in apr_pollset_create errors;
         just give the standard "check system or user limits"
         message

 ------------------------------------------------------------------------
r1203858 | trawick | 2011-11-18 22:39:33 +0100

follow up to r1202257 -- perform normal wakeup processing when
APR_EINTR is seen from apr_pollset_poll(), with expectation that
it was triggered by apr_pollset_wakeup()

 ------------------------------------------------------------------------
r1202395 | trawick | 2011-11-15 20:38:31 +0100

spellcheck r1202258

 ------------------------------------------------------------------------
r1202329 | pquerna | 2011-11-15 18:47:33 +0100

Calculate the power of two size of the buffer before allocating it.

Spotted by: Rüdiger Plüm

 ------------------------------------------------------------------------
r1202259 | pquerna | 2011-11-15 16:52:59 +0100

Use apr_pollset_wakeup to ensure that the listener thread will process most enqueue'd events quickly

 ------------------------------------------------------------------------
r1202258 | pquerna | 2011-11-15 16:52:00 +0100

Because the pollset is now only mutated from the event thread, we no longer need the APR_POLLSET_THREADSAFE flag for the event_pollset

 ------------------------------------------------------------------------
r1202257 | pquerna | 2011-11-15 16:51:03 +0100

Create a new lock free circular queue, and use it in the EventMPM to remove the timeout mutex that was wrapping both timeout queue operations and pollset operations.

 ------------------------------------------------------------------------
r1202256 | pquerna | 2011-11-15 16:50:09 +0100

Instead of disabling the listening sockets from the pollset when under load, just stop calling the accept call, but leave the sockets in the pollset.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1293426 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 21:27:13 +00:00