]>
granicus.if.org Git - apache/log
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Stefan Fritsch [Fri, 2 Dec 2011 22:18:09 +0000 (22:18 +0000)]
Merge r1206850:
- Add some error handling for writing to the output filter chain.
- Add some ap_assert()s for error cases that probably should not happen (and
the following code would break).
These fix some compiler warnings about "variable 'rv' set but not used".
- Prevent a leak of a bucket in one error case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209736 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 18:32:37 +0000 (18:32 +0000)]
Backport:
mod_auth_form: Use apr_status_t for the mod_session API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209626 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 18:16:58 +0000 (18:16 +0000)]
Backport:
mod_session_dbd: Use apr_status_t as a return code across the mod_session API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209620 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 17:51:27 +0000 (17:51 +0000)]
Backport:
mod_session: Use apr_status_t as a return code across the mod_session API,
clarify where we ignore errors and why.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209606 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 2 Dec 2011 17:50:02 +0000 (17:50 +0000)]
Merge r1209601:
Fix segfault with Solaris LDAP SDK when enabling ldaps.
Enable SSL by passing secure=1 to apr_ldap_init instead of calling
apr_ldap_set_option(... APR_LDAP_OPT_TLS ...).
This change carefully avoids any change of behavior on non-Solaris LDAP SDKs.
PR: 42682
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209604 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 14:17:02 +0000 (14:17 +0000)]
Clarify the crypto notice for mod_session_crypto.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209506 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 14:12:51 +0000 (14:12 +0000)]
Update the crypto notices for apr_crypto. apr_ssl is long gone.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209500 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 13:27:03 +0000 (13:27 +0000)]
Backport:
mod_session_crypto: Fix a pool lifetime problem when reading from
SessionCryptoPassphraseFile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209466 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Dec 2011 12:24:15 +0000 (12:24 +0000)]
Merge r1209417 from trunk:
* server/listen.c (open_listeners): Fix logic error caught by
Coverity; possible NULL pointer deref at startup with a
particular (and unlikely) listener/system config.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209439 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Dec 2011 12:12:24 +0000 (12:12 +0000)]
Merge r1209432 from trunk:
Fix for additional cases of URL rewriting with ProxyPassMatch or
RewriteRule, where particular request-URIs could result in undesired
backend network exposure in some configurations. (CVE-2011-4317)
Thanks to Prutha Parikh from Qualys for reporting this issue.
* modules/proxy/mod_proxy.c (proxy_trans): Decline to handle the "*"
request-URI. Fail for cases where r->uri does not begin with a "/".
* modules/mappers/mod_rewrite.c (hook_uri2file): Likewise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209436 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 2 Dec 2011 02:29:54 +0000 (02:29 +0000)]
Backport r1209330 from trunk
Bring Windows httpd.conf up to date with documented or required modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209331 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 14:04:30 +0000 (14:04 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209090 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 14:03:49 +0000 (14:03 +0000)]
Changes to v2.4 APIs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209089 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 13:27:18 +0000 (13:27 +0000)]
Remove some stray @ characters.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209070 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 12:57:59 +0000 (12:57 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209062 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 12:46:40 +0000 (12:46 +0000)]
Backport:
mod_rewrite: Add the AllowNoSlash RewriteOption, which makes it possible
for RewriteRules to be placed in .htaccess files that match the directory
with no trailing slash. PR 48304.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1209057 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 00:45:31 +0000 (00:45 +0000)]
Wish came true: CacheEnable works within LocationMatch, giving us mod_cache
regexes for no additional cost.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208917 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 1 Dec 2011 00:03:50 +0000 (00:03 +0000)]
Merge r1208897 from trunk:
Use 2 sep hashing functions to account for collisions...
Safe enough
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208899 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 30 Nov 2011 22:29:19 +0000 (22:29 +0000)]
Merge r1208835:
Remove some getpid() logging, this is now also included in the error log format.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208848 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 22:00:43 +0000 (22:00 +0000)]
Backport:
mod_cache: Apply the API change that allows future mod_cache providers to
invalidate cache entries, which will fix PR15868.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208824 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 30 Nov 2011 21:54:58 +0000 (21:54 +0000)]
Merge r1208816:
Remove some more now redundant log prefixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208820 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 20:31:26 +0000 (20:31 +0000)]
Backport:
Clarify the peer IP of the connection and the client IP of the request within
the docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208754 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 19:41:06 +0000 (19:41 +0000)]
RPM: Make it possible to build mod_socache_dc against distcache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208727 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 30 Nov 2011 17:28:47 +0000 (17:28 +0000)]
Added missing proxy import to Netware build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208533 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 30 Nov 2011 17:16:09 +0000 (17:16 +0000)]
Fixed compilation for non-*nix platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208527 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 17:00:24 +0000 (17:00 +0000)]
Backport:
mod_session_crypto: Add a SessionCryptoPassphraseFile directive so that the
administrator can hide the keys from the configuration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1208518 13f79535 -47bb-0310-9956-
ffa450edef68