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

22739 Commits

Author SHA1 Message Date
Rainer Jung
48b9f4e277 Fix typo which was already fixed in 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238808 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 20:51:11 +00:00
Rainer Jung
5eb53da342 Remove unwanted tanslation leftover.
Was introduced in r1210120.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238768 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 19:43:10 +00:00
Rainer Jung
b008850345 update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

Forward port of r1221304 from 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238749 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 19:04:59 +00:00
Rainer Jung
943828034c update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by:  Orhan Berent <berent belgeler.org>

Forward port of r1215501 from 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238746 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 18:59:30 +00:00
Rainer Jung
13fd08da11 Sync docs with 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238738 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 18:38:02 +00:00
Rainer Jung
51e64c5cfe Some doc updates
Forward port of r1234890 from 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238726 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 18:13:52 +00:00
Jim Jagielski
d9e586b047 xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238703 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 17:38:36 +00:00
Jim Jagielski
7b54660f3e c/p error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238701 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 17:37:08 +00:00
Jim Jagielski
916ae59243 Docco r1229021
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238695 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 16:53:27 +00:00
Rainer Jung
2f24671828 Fix copy&paste error in comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238545 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 14:00:14 +00:00
Rainer Jung
d8e782ea5c I guess that makes sense.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238528 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 13:51:03 +00:00
Rainer Jung
b91dd1ad4d Add event MPM description.
Partial forward port of r1201214 from 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238405 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 11:49:34 +00:00
Rainer Jung
e71a05cd26 iThese deserve their place in httpd.conf on Windows
Foreward port of r1234291 from 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238402 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 11:45:18 +00:00
Rainer Jung
6f9bc21613 Update copyrights for externally visible and changed code
Forward port of r1234336 from 2.4.x.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1238399 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 11:38:22 +00:00
Stefan Fritsch
4fca50f997 Install multiple files per install.sh invocation
Libtool and BSD install support installing several files in one run.
Add support to install.sh and instdso.sh, too.
Replace for-loops in the Makefiles.

This reduces 'make install' time by approx. 50% because we save
lots of calls to the huge libtool shell script.

The AIX-specific magic in instdso.sh could use some testing.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1237447 13f79535-47bb-0310-9956-ffa450edef68
2012-01-29 20:11:55 +00:00
Jeff Trawick
95fba12ad8 s/insure/ensure/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1237407 13f79535-47bb-0310-9956-ffa450edef68
2012-01-29 18:22:35 +00:00
Lucien Gentis
9f81404ede Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1236701 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 14:51:24 +00:00
Jim Jagielski
d052a532be https also needs QS
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1236350 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 19:14:58 +00:00
Ruediger Pluem
556939e67f * Don't typedef twice (in .c and .h file).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1236122 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 10:03:36 +00:00
Stefan Fritsch
e499c6e683 Make the core input/output filter contexts private and provide accessor APIs
for mpm_winnt and mod_ftp.

This allows to add members to the context structs without breaking binary
compatibility.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1235019 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 21:58:42 +00:00
Joe Orton
b6f6f96733 * server/core_filters.c (send_brigade_nonblocking): Use a non-blocking
bucket read, allowing any pending data to be flushed before trying a
  (potentially slow) blocking read.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234899 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 16:57:07 +00:00
Stefan Fritsch
60eb4d27eb 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/trunk@1234876 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 16:13:08 +00:00
Joe Orton
bf40995d94 * 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/trunk@1234848 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 15:19:07 +00:00
Eric Covener
76aa41352d CVE-2012-0053: 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/trunk@1234837 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 15:04:09 +00:00
Stefan Fritsch
7cc2917b41 update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234644 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 23:30:02 +00:00
Stefan Fritsch
29bd6ba338 Fix docs for Include, add docs for IncludeOptional
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234643 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 23:26:31 +00:00
Stefan Fritsch
bbf60bffa7 Add a validate-xml target
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234642 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 23:19:57 +00:00
Stefan Fritsch
95bfe997d6 ctx->bytes_in is never used. Remove a useless iteration through the brigade
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234574 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 18:50:21 +00:00
Stefan Fritsch
c6e601be12 Improve indentation, no code change
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234565 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 18:27:11 +00:00
Lucien Gentis
fc71b2b27f Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234511 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 13:27:38 +00:00
Stefan Fritsch
b26606a1c5 Document the rather surprising code path on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234479 13f79535-47bb-0310-9956-ffa450edef68
2012-01-22 10:48:23 +00:00
Stefan Fritsch
f21ee09d4a More configure time dependencies:
mod_cache_disk depends on mod_cache
mod_heartbeat depends on mod_watchdog


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234297 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 10:26:51 +00:00
Stefan Fritsch
21cc07a470 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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1234180 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 22:14:31 +00:00
Joe Orton
bcd017972c * server/core_filters.c (ap_core_input_filter): Only treat EAGAIN as
success if a non-blocking read was requested; for a blocking read,
  it is an error condition.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1233882 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 12:41:18 +00:00
Jeff Trawick
6635e5a3da 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/trunk@1233604 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 22:23:15 +00:00
Graham Leggett
bad70ddb3e configure: Move the --with-included-apr check so that srcdir!=builddir builds
aren't broken by it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232838 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 11:30:27 +00:00
William A. Rowe Jr
46ea51cc73 Anticipate win32+win64
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232630 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 22:58:23 +00:00
William A. Rowe Jr
5153ca5d0c Service named 2.x on trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232624 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 22:50:13 +00:00
William A. Rowe Jr
6df305d79f Further win32 edits anticipating 1.0.1-final is soon
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232622 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 22:49:16 +00:00
Stefan Fritsch
58dd721bc8 Reword the paragraph about --with-included-apr to mention the -deps
tarball.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232594 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:41:24 +00:00
Stefan Fritsch
5a05949a2f Trunk is at 2.5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1232583 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:30:22 +00:00
Graham Leggett
a0930811c9 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/trunk@1232575 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:12:19 +00:00
Graham Leggett
a94da6ff0f 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/trunk@1232224 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 23:17:23 +00:00
Stefan Fritsch
3d7c32f8c7 Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231783 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 22:46:12 +00:00
Jeff Trawick
00e489fc76 generated files and revision numbers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231608 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 01:40:32 +00:00
Jeff Trawick
ae5d1f38b1 fix syntax errors in Mutex examples
Submitted by: Daniel Shahaf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231607 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 01:36:45 +00:00
Jeff Trawick
ba8bc09ce4 fix const warning with strchr->ap_strchr mapping
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231602 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 00:27:57 +00:00
Jeff Trawick
89c22869f4 remove unused function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231601 13f79535-47bb-0310-9956-ffa450edef68
2012-01-15 00:27:16 +00:00
Lucien Gentis
01ee0e4737 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231518 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 15:58:59 +00:00
Lucien Gentis
7086a4bac4 Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1231510 13f79535-47bb-0310-9956-ffa450edef68
2012-01-14 15:01:11 +00:00