]> granicus.if.org Git - apache/log
apache
12 years agoRevert a premature bit of r1228262, part of size_t corrections part 2
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

12 years agoCure size_t abuse; Backport r1227856
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

12 years agoMerge r1227637, r1227642 from trunk:
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

12 years agoxforms
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

12 years agoMerge r1226603, r1226775 from trunk:
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

12 years agos/2011/2012/g
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

12 years agoMerge r1226477 from trunk:
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

12 years agoMerge r1226375:
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

12 years agoMerge r1226339:
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

12 years agomerge r1225796:
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

12 years agoMerge r1225795:
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

12 years agomerge r1225791 from trunk:
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

12 years agoAdd changes entry for r1225477
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

12 years agoMerge r1225478:
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

12 years agoMerge r1225476:
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

12 years agoMerge r1225380:
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

12 years agoMerge r1225198:
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

12 years agoMerge r1225197:
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

12 years agomerge r1225060 from trunk:
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

12 years agomerge r1223048 from trunk:
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

12 years agomerge r1222930 from trunk:
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

12 years agoupdate transformation
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

12 years agomerge r1222921 from trunk:
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

12 years agomerge r1222917 from trunk:
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

12 years agomerge r1222915 from trunk:
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

12 years agoBackport:
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

12 years agoUpdate transformations.
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

12 years agoBackport:
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

12 years agoUpdate transformations.
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

12 years agoBuild the man page for httxt2dbm.
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

12 years agoupdate transformations.
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

12 years agoupdate for sync with English docs.
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

12 years agoBackport:
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

12 years agoSome cosmetic NetWare makefile tweaks.
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

12 years agoBackport:
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

12 years agoBackport:
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

12 years agoBackport:
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

12 years agoUpdate transformations.
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

12 years agoClarify which tarballs we are talking about.
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

12 years agoBackport.
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

12 years agoAdd further explanation on RPM packaging.
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

12 years agoUpdate transformations.
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

12 years agoBackport:
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

12 years agoVarious code cleanup to avoid compiler, cppcheck, or clang warnings:
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

12 years agoMerge r1220467:
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

12 years agoMerge r1220462:
Stefan Fritsch [Sun, 18 Dec 2011 17:58:25 +0000 (17:58 +0000)]
Merge r1220462:
remove some dead code
found by clang statical analyzer

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1220507 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate transformations.
Nilgun Belma Buguner [Sat, 17 Dec 2011 14:43:46 +0000 (14:43 +0000)]
update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1215502 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sat, 17 Dec 2011 14:41:15 +0000 (14:41 +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@1215501 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate transformations.
Nilgun Belma Buguner [Sat, 17 Dec 2011 12:13:33 +0000 (12:13 +0000)]
update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1215474 13f79535-47bb-0310-9956-ffa450edef68

12 years agoNew Turkish translation
Nilgun Belma Buguner [Sat, 17 Dec 2011 12:06:39 +0000 (12:06 +0000)]
New Turkish translation

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@1215473 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Sat, 17 Dec 2011 12:05:20 +0000 (12:05 +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@1215471 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate translation
Nilgun Belma Buguner [Sat, 17 Dec 2011 11:46:56 +0000 (11:46 +0000)]
update translation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1215465 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAnd we are back to 2.4.0-dev
Jim Jagielski [Thu, 15 Dec 2011 14:47:27 +0000 (14:47 +0000)]
And we are back to 2.4.0-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1214793 13f79535-47bb-0310-9956-ffa450edef68

12 years agoGet ready to tag 2.3.16-beta
Jim Jagielski [Thu, 15 Dec 2011 14:38:00 +0000 (14:38 +0000)]
Get ready to tag 2.3.16-beta

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1214787 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport r1214296...
Jim Jagielski [Wed, 14 Dec 2011 15:29:56 +0000 (15:29 +0000)]
Backport r1214296...
Allow AP_SERVER_ADD_STRING to be more "easily" changed

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1214297 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate transformations.
Graham Leggett [Wed, 14 Dec 2011 01:36:30 +0000 (01:36 +0000)]
Update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1214023 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport:
Graham Leggett [Wed, 14 Dec 2011 01:32:31 +0000 (01:32 +0000)]
Backport:
Further clarify the naming of the entity that originates the request by
calling that entity a useragent instead of a client.
Further clarify the naming of the entity that directly connects to us by
calling that entity a client instead of a peer.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1214022 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1213567:
Stefan Fritsch [Tue, 13 Dec 2011 05:55:11 +0000 (05:55 +0000)]
Merge r1213567:
Explicitly cast function pointer, to remove 'const'.
Hopefully this makes the NetWare compiler happy.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1213570 13f79535-47bb-0310-9956-ffa450edef68

12 years agoupdate xforms
Jim Jagielski [Mon, 12 Dec 2011 20:07:53 +0000 (20:07 +0000)]
update xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1213403 13f79535-47bb-0310-9956-ffa450edef68

12 years agoremove unused var
Jim Jagielski [Mon, 12 Dec 2011 20:06:24 +0000 (20:06 +0000)]
remove unused var

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1213402 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1210261 from trunk:
Jim Jagielski [Mon, 12 Dec 2011 20:05:52 +0000 (20:05 +0000)]
Merge r1210261 from trunk:

mod_slotmem_shm: Remove the colon syntax to indicate a relative path, and
make the relative path default behaviour. Remove the word "anonymous" as
a filename for special treatment, what used to be "anonymous" is now "none".

Submitted by: minfrin
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1213401 13f79535-47bb-0310-9956-ffa450edef68

12 years agobackport r1213399 from trunk:
Kaspar Brand [Mon, 12 Dec 2011 20:05:27 +0000 (20:05 +0000)]
backport r1213399 from trunk:

logging adjustments:
- consistently call ssl_log_ssl_error after ap_log_error etc.
- ssl_init_ConfigureServer: add vhost_id to log message

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1213400 13f79535-47bb-0310-9956-ffa450edef68

12 years agobackport r1213380 from trunk:
Kaspar Brand [Mon, 12 Dec 2011 19:51:05 +0000 (19:51 +0000)]
backport r1213380 from trunk:

Streamline TLS session ticket key handling (added in r1200040):
- drop the SSLTicketKeyDefault directive, and only support a single
  ticket key per server/vhost
- rename the SSLTicketKeyFile directive to SSLSessionTicketKeyFile,
  remove the keyname parameter
- move ticket key parameters from SSLSrvConfigRec to modssl_ctx_t
- configure the tlsext_ticket_key_cb only when in server mode
- add documentation for SSLSessionTicketKeyFile

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1213395 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1213338:
Stefan Fritsch [Mon, 12 Dec 2011 18:20:15 +0000 (18:20 +0000)]
Merge r1213338:
Limit length of lines in .htaccess to 8K again, to reduce DoS potential.
Make ap_varbuf_cfg_getline() strictly enforce the max_len parameter.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1213344 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1212883:
Stefan Fritsch [Sat, 10 Dec 2011 21:27:22 +0000 (21:27 +0000)]
Merge r1212883:
Fix names of unary operators like '-s' being compared case insensitively.
Improve error message if op or function is not found. Document '-s' operator.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1212884 13f79535-47bb-0310-9956-ffa450edef68

12 years agoTypo correction.
Rich Bowen [Fri, 9 Dec 2011 19:50:29 +0000 (19:50 +0000)]
Typo correction.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1212600 13f79535-47bb-0310-9956-ffa450edef68

12 years agoRPM: Update the spec file to require at least apr-util v1.4.x.
Graham Leggett [Fri, 9 Dec 2011 13:38:28 +0000 (13:38 +0000)]
RPM: Update the spec file to require at least apr-util v1.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1212414 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1211680:
Stefan Fritsch [Wed, 7 Dec 2011 22:36:29 +0000 (22:36 +0000)]
Merge r1211680:

Various fixes for log message tags:

- Remove tags in ssl_log_ssl_error() and ssl_log_cert_error()
- Instead add tags to various ssl_log_xerror, ssl_log_cxerror
  calls (ssl_log_rxerror is unused).
- likewise for modssl_proxy_info_log()

- Fix spelling of APLOG_NOERRNO in coccinelle script
- add support for ssl_log_*error and ap_log_cserror

- add some more tags missing due to APLOG_NOERRNO spelling error

- Remove tags from example modules (we don't want people to blindly copy
  those)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211682 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1211663:
Stefan Fritsch [Wed, 7 Dec 2011 22:06:41 +0000 (22:06 +0000)]
Merge r1211663:
Remove usage of APLOG_NOERRNO. It has been a no-op since at least 2.0.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211669 13f79535-47bb-0310-9956-ffa450edef68

12 years agoOops. Revert r1211661 for now, r1210261 has to be merged first.
Stefan Fritsch [Wed, 7 Dec 2011 22:03:00 +0000 (22:03 +0000)]
Oops. Revert r1211661 for now, r1210261 has to be merged first.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211666 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1211637:
Stefan Fritsch [Wed, 7 Dec 2011 21:57:34 +0000 (21:57 +0000)]
Merge r1211637:
Remove unused variable

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211661 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdd reference to the mod_socache modules in the mod_ssl docs.
Graham Leggett [Wed, 7 Dec 2011 16:48:54 +0000 (16:48 +0000)]
Add reference to the mod_socache modules in the mod_ssl docs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211529 13f79535-47bb-0310-9956-ffa450edef68

12 years agoRemoved some proxy imports from NetWare build.
Guenter Knauf [Wed, 7 Dec 2011 10:39:23 +0000 (10:39 +0000)]
Removed some proxy imports from NetWare build.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211380 13f79535-47bb-0310-9956-ffa450edef68

12 years agoRemoved import file since now dynamically generated.
Guenter Knauf [Wed, 7 Dec 2011 10:29:56 +0000 (10:29 +0000)]
Removed import file since now dynamically generated.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211379 13f79535-47bb-0310-9956-ffa450edef68

12 years agobackport r1211352 from trunk:
Kaspar Brand [Wed, 7 Dec 2011 09:42:38 +0000 (09:42 +0000)]
backport r1211352 from trunk:

Adjust the OpenSSL session id context for SNI configurations, so that
sessions are tied to the proper vhost (subset of a patch I originally
proposed in November 2009, cf. message with ID <4AF85A18.1000205@velox.ch>).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1211353 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate latest xforms
Jim Jagielski [Tue, 6 Dec 2011 15:10:35 +0000 (15:10 +0000)]
Update latest xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210966 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBasic docs for these modules now exists.
Graham Leggett [Tue, 6 Dec 2011 15:10:35 +0000 (15:10 +0000)]
Basic docs for these modules now exists.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210965 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate transformations.
Graham Leggett [Tue, 6 Dec 2011 14:59:04 +0000 (14:59 +0000)]
Update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210957 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport:
Graham Leggett [Tue, 6 Dec 2011 14:56:59 +0000 (14:56 +0000)]
Backport:
Create initial documentation for mod_socache_shmcb, mod_socache_dc,
mod_socache_dbm and mod_socache_memcache.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210956 13f79535-47bb-0310-9956-ffa450edef68

12 years agoNetWare build fixes.
Guenter Knauf [Tue, 6 Dec 2011 14:18:01 +0000 (14:18 +0000)]
NetWare build fixes.

Create mod_cache.imp dynamically; fixed mod_cache_disk NLM name.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210926 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport:
Graham Leggett [Tue, 6 Dec 2011 13:04:50 +0000 (13:04 +0000)]
Backport:
mod_cache: Remove dead code from the legacy mod_mem_cache module.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210893 13f79535-47bb-0310-9956-ffa450edef68

12 years agofix my typo
Gregg Lewis Smith [Tue, 6 Dec 2011 11:29:54 +0000 (11:29 +0000)]
fix my typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210870 13f79535-47bb-0310-9956-ffa450edef68

12 years agoUpdate transofmrations.
Graham Leggett [Tue, 6 Dec 2011 01:00:08 +0000 (01:00 +0000)]
Update transofmrations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210729 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport:
Graham Leggett [Tue, 6 Dec 2011 00:59:01 +0000 (00:59 +0000)]
Backport:
Overhaul the caching guide in an effort to clearly distinguish between
the mod_cache caching, the socache caching, and other caching we do, such
as mod_file_cache.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210727 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport -r1210443 from trunk
Mladen Turk [Mon, 5 Dec 2011 13:11:35 +0000 (13:11 +0000)]
Backport -r1210443 from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210449 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1210378:
Stefan Fritsch [Mon, 5 Dec 2011 09:40:10 +0000 (09:40 +0000)]
Merge r1210378:
Fix a few compiler warning reported by Steffen:
- some signed/unsigned mismatches
- const for a function does not make sense

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210379 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdd CHANGES entries for r1210287 and r1210224
Stefan Fritsch [Mon, 5 Dec 2011 00:10:18 +0000 (00:10 +0000)]
Add CHANGES entries for r1210287 and r1210224

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210288 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport r1209766, r1210252, r1210284:
Stefan Fritsch [Mon, 5 Dec 2011 00:08:01 +0000 (00:08 +0000)]
Backport r1209766, r1210252, r1210284:

Add lots of unique tags to error log messages

ssl_util.c: Downgrade some dynamic locking messages from level DEBUG
to TRACE1-3

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210287 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1210221:
Stefan Fritsch [Sun, 4 Dec 2011 21:07:58 +0000 (21:07 +0000)]
Merge r1210221:
Change the provider names to match the module names:
mod_slotmem_shm: shared -> shm
mod_socache_memcache: mc -> memcache

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210224 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1210219: fix typo
Stefan Fritsch [Sun, 4 Dec 2011 21:04:40 +0000 (21:04 +0000)]
Merge r1210219: fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210222 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1210130:
Stefan Fritsch [Sun, 4 Dec 2011 16:10:06 +0000 (16:10 +0000)]
Merge r1210130:
More pointers to mod_socache*

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210133 13f79535-47bb-0310-9956-ffa450edef68

12 years agoPartially revert r1203861: use a fixed string
Rainer Jung [Sun, 4 Dec 2011 15:20:51 +0000 (15:20 +0000)]
Partially revert r1203861: use a fixed string
per module as the proxy_function instead of
the macro __FUNCTION__ which is not C89.

There's no real loss of information, because all
of the calls are in the same scgi handler function.

All proxy modules apart form SCGI already use the
upper case scheme in the analogous calls.

Backport of r1210124 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210125 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1210080:
Stefan Fritsch [Sun, 4 Dec 2011 09:16:12 +0000 (09:16 +0000)]
Merge r1210080:
Point to mod_socache_* in the SSLSessionCache error message

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210083 13f79535-47bb-0310-9956-ffa450edef68

12 years agoAdjust comments to say 2.4.0, not 2.5.0
Stefan Fritsch [Sun, 4 Dec 2011 09:07:22 +0000 (09:07 +0000)]
Adjust comments to say 2.4.0, not 2.5.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210081 13f79535-47bb-0310-9956-ffa450edef68

12 years agomod_proxy: Note that proxy_lb_workers was removed from the public API.
Graham Leggett [Sat, 3 Dec 2011 21:56:11 +0000 (21:56 +0000)]
mod_proxy: Note that proxy_lb_workers was removed from the public API.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210023 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport:
Graham Leggett [Sat, 3 Dec 2011 18:02:24 +0000 (18:02 +0000)]
Backport:
mod_proxy: Remove dead code from the public API, move single use code out
of the public API, remove redundant code from the public API.
mod_cache: Remove redundant code from the public API.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209960 13f79535-47bb-0310-9956-ffa450edef68

12 years agoBackport:
Graham Leggett [Sat, 3 Dec 2011 17:26:28 +0000 (17:26 +0000)]
Backport:
mod_proxy: Make ap_proxy_retry_worker() into an optional function. Allows
mod_lbmethod_bybusyness, mod_lbmethod_byrequests, mod_lbmethod_bytraffic
and mod_lbmethod_heartbeat to be loaded without mod_proxy yet being present,
which happens when modules are loaded in alphabetical order.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209958 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge header parts of r1209743 and r1209773:
Stefan Fritsch [Fri, 2 Dec 2011 23:19:04 +0000 (23:19 +0000)]
Merge header parts of r1209743 and r1209773:
Add APLOGNO() macro for unique tags for every log message.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209777 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1202236:
Stefan Fritsch [Fri, 2 Dec 2011 22:32:29 +0000 (22:32 +0000)]
Merge r1202236:
ap_core_translate: factor out duplicate code.  no functional change.

Submitted by: Greg Ames

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209748 13f79535-47bb-0310-9956-ffa450edef68

12 years agoMerge r1209741:
Stefan Fritsch [Fri, 2 Dec 2011 22:24:19 +0000 (22:24 +0000)]
Merge r1209741:
Fix apr_status_t being passed as loglevel

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1209742 13f79535-47bb-0310-9956-ffa450edef68