]>
granicus.if.org Git - apache/log
Jeff Trawick [Mon, 12 Dec 2011 19:21:37 +0000 (19:21 +0000)]
definAtely
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1213381 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 12 Dec 2011 19:21:35 +0000 (19:21 +0000)]
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/trunk@
1213380 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 12 Dec 2011 17:50:33 +0000 (17:50 +0000)]
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/trunk@
1213338 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 10 Dec 2011 21:26:00 +0000 (21:26 +0000)]
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/trunk@
1212883 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 10 Dec 2011 21:03:19 +0000 (21:03 +0000)]
Typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1212872 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 9 Dec 2011 13:27:07 +0000 (13:27 +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/trunk@
1212402 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 8 Dec 2011 16:41:57 +0000 (16:41 +0000)]
Typo correction.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1211968 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 7 Dec 2011 22:33:35 +0000 (22:33 +0000)]
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/trunk@
1211680 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 7 Dec 2011 21:59:16 +0000 (21:59 +0000)]
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/trunk@
1211663 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 7 Dec 2011 21:13:57 +0000 (21:13 +0000)]
Remove unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1211637 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 7 Dec 2011 16:47:32 +0000 (16:47 +0000)]
Add reference to the mod_socache modules in the mod_ssl docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1211528 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Dec 2011 16:13:30 +0000 (16:13 +0000)]
* modules/: More doxy group fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1211495 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Dec 2011 16:06:16 +0000 (16:06 +0000)]
* include/httpd.h, server/mpm/*/*.h: Tidy up doxygen tree view by moving
private interfaces into a separate group.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1211490 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/trunk@
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/trunk@
1211379 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Dec 2011 10:06:21 +0000 (10:06 +0000)]
* include/: Various doxy markup tweaks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1211364 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 7 Dec 2011 09:41:51 +0000 (09:41 +0000)]
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/trunk@
1211352 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Dec 2011 09:40:41 +0000 (09:40 +0000)]
* include/util_varbuf.h: Doxygen tweaks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1211351 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 6 Dec 2011 15:15:25 +0000 (15:15 +0000)]
The mod_socache* modules now have basic documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210975 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Dec 2011 14:56:19 +0000 (14:56 +0000)]
Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210955 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 6 Dec 2011 14:55:15 +0000 (14:55 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210954 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 6 Dec 2011 14:53:23 +0000 (14:53 +0000)]
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/trunk@
1210951 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/trunk@
1210926 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 6 Dec 2011 13:03:34 +0000 (13:03 +0000)]
mod_cache: Remove dead code from the legacy mod_mem_cache module.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210892 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 6 Dec 2011 11:28:44 +0000 (11:28 +0000)]
Fix my typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210869 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 6 Dec 2011 00:57:45 +0000 (00:57 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210726 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 6 Dec 2011 00:54:08 +0000 (00:54 +0000)]
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/trunk@
1210725 13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Mon, 5 Dec 2011 13:09:54 +0000 (13:09 +0000)]
No need for process.h system include since we don't use getpid() any more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210447 13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Mon, 5 Dec 2011 13:07:47 +0000 (13:07 +0000)]
Axe check for second post config call. New ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG API call does exactly that, so we were actually expecting 4 calls ending up with NULL config in child hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210445 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 5 Dec 2011 09:38:44 +0000 (09:38 +0000)]
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/trunk@
1210378 13f79535 -47bb-0310-9956-
ffa450edef68
Hiroaki Kawai [Mon, 5 Dec 2011 05:54:43 +0000 (05:54 +0000)]
Update translation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210336 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 23:57:02 +0000 (23:57 +0000)]
Add some more log message tags
Add some more mod_ssl macros that confuse coccinelle. Remove restriction
on format string because it causes coccinelle to not consider multi line format
strings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210284 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 23:36:32 +0000 (23:36 +0000)]
Update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210279 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 4 Dec 2011 22:28:40 +0000 (22:28 +0000)]
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".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210261 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 22:09:24 +0000 (22:09 +0000)]
Add some more log message tags
Remove some log message tags from ap_log_* calls that log lots of
different error messages, in particular the config parsing errors.
Not sure how we should handle those.
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/trunk@
1210252 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 22:00:28 +0000 (22:00 +0000)]
Add some mod_ssl macros that confuse coccinelle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210246 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 21:28:12 +0000 (21:28 +0000)]
coccinelle 1.0 has changed the syntax for regexps
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210226 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 21:03:34 +0000 (21:03 +0000)]
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/trunk@
1210221 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 20:58:51 +0000 (20:58 +0000)]
-1 to introducing new months so late in the release cycle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210219 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 4 Dec 2011 17:15:32 +0000 (17:15 +0000)]
Fix typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210148 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 16:05:28 +0000 (16:05 +0000)]
More pointers to mod_socache*
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210130 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 4 Dec 2011 15:16:45 +0000 (15:16 +0000)]
Partially revert r1203859: 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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210124 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 4 Dec 2011 14:57:20 +0000 (14:57 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210120 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 4 Dec 2011 09:05:07 +0000 (09:05 +0000)]
Point to mod_socache_* in the SSLSessionCache error message
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210080 13f79535 -47bb-0310-9956-
ffa450edef68
Hiroaki Kawai [Sun, 4 Dec 2011 08:18:41 +0000 (08:18 +0000)]
Update Japanese translation.
# Changes were white spaces in English.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210073 13f79535 -47bb-0310-9956-
ffa450edef68
Hiroaki Kawai [Sun, 4 Dec 2011 08:17:06 +0000 (08:17 +0000)]
Update Japanese translation.
# Changes were white spaces in English.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210072 13f79535 -47bb-0310-9956-
ffa450edef68
Hiroaki Kawai [Sun, 4 Dec 2011 07:56:03 +0000 (07:56 +0000)]
fix typo.
Submitted by: OKANO Takayoshi <kano@na.rim.or.jp>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1210067 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 21:51:55 +0000 (21:51 +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/trunk@
1210019 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 17:24:30 +0000 (17:24 +0000)]
MMN bump for the removals from the public mod_proxy API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209956 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 17:09:58 +0000 (17:09 +0000)]
mod_proxy: Remove dead code ap_proxy_table_unmerge().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209952 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 16:45:29 +0000 (16:45 +0000)]
mod_proxy: Move ap_proxy_strmatch_path and ap_proxy_strmatch_domain out of
the public API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209947 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 14:41:04 +0000 (14:41 +0000)]
mod_proxy: Remove ap_proxy_make_fake_req() from the public API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209917 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 14:39:51 +0000 (14:39 +0000)]
mod_proxy: Remove ap_proxy_make_fake_req() from the public API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209916 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 14:09:54 +0000 (14:09 +0000)]
mod_proxy: Remove dead PROXY_OPTIONAL_HOOK macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209913 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 13:38:26 +0000 (13:38 +0000)]
mod_proxy: Remove dead code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209910 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 13:29:05 +0000 (13:29 +0000)]
mod_proxy: Make the ap_proxy_is* functions private.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209908 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 01:08:59 +0000 (01:08 +0000)]
mod_proxy: Make sure we populate the client IP from the peer IP for proxy
fake requests.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209814 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 01:03:08 +0000 (01:03 +0000)]
mod_proxy: Remove ap_proxy_date_canon() from the public API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209812 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 00:57:19 +0000 (00:57 +0000)]
mod_proxy: Remove ap_proxy_buckets_lifetime_transform() from the public API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209811 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 00:31:53 +0000 (00:31 +0000)]
mod_cache: Remove ap_cache_liststr(), it duplicates ap_find_token().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209798 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 3 Dec 2011 00:30:06 +0000 (00:30 +0000)]
mod_proxy: Remove ap_proxy_liststr(), it duplicates ap_find_token().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209797 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 23:18:39 +0000 (23:18 +0000)]
mod_proxy: Move ap_proxy_string_read() out of the public API into
mod_proxy_ftp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209776 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 2 Dec 2011 23:09:31 +0000 (23:09 +0000)]
update MMN, not only the comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209773 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 2 Dec 2011 23:02:04 +0000 (23:02 +0000)]
Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209766 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 22:42:39 +0000 (22:42 +0000)]
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/trunk@
1209754 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 2 Dec 2011 22:26:54 +0000 (22:26 +0000)]
Add APLOGNO() macro for unique tags for every log message.
Add some scripts to make adding these tags easier.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209743 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 2 Dec 2011 22:22:51 +0000 (22:22 +0000)]
Fix apr_status_t being passed as loglevel
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209741 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 18:24:10 +0000 (18:24 +0000)]
mod_auth_form: Use apr_status_t for the mod_session API.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209623 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 18:14:52 +0000 (18:14 +0000)]
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/trunk@
1209618 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 17:47:05 +0000 (17:47 +0000)]
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/trunk@
1209603 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 2 Dec 2011 17:44:09 +0000 (17:44 +0000)]
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/trunk@
1209601 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 14:16:46 +0000 (14:16 +0000)]
Clarify the crypto notice for mod_session_crypto.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209505 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 14:12:16 +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/trunk@
1209499 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 2 Dec 2011 13:23:21 +0000 (13:23 +0000)]
mod_session_crypto: Fix a pool lifetime problem when reading from
SessionCryptoPassphraseFile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209461 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Dec 2011 12:04:20 +0000 (12:04 +0000)]
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/trunk@
1209432 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 2 Dec 2011 11:28:44 +0000 (11:28 +0000)]
* 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/trunk@
1209417 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Fri, 2 Dec 2011 02:27:06 +0000 (02:27 +0000)]
Bring Windows httpd.conf up to date with documented or required modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209330 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 14:02:31 +0000 (14:02 +0000)]
Update transformation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209086 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 14:01:25 +0000 (14:01 +0000)]
Changes to v2.4 APIs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209085 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 12:56:15 +0000 (12:56 +0000)]
Update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1209061 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 12:40:51 +0000 (12:40 +0000)]
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/trunk@
1209053 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 1 Dec 2011 00:47:31 +0000 (00:47 +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/trunk@
1208920 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 1 Dec 2011 00:02:30 +0000 (00:02 +0000)]
Use 2 sep hashing functions to account for collisions...
Safe enough
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208897 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 30 Nov 2011 22:15:55 +0000 (22:15 +0000)]
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/trunk@
1208835 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 21:56:11 +0000 (21:56 +0000)]
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/trunk@
1208822 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 30 Nov 2011 21:51:51 +0000 (21:51 +0000)]
Remove some more now redundant log prefixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208816 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 20:28:25 +0000 (20:28 +0000)]
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/trunk@
1208753 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 19:40:31 +0000 (19:40 +0000)]
RPM: Make it possible to build mod_socache_dc against distcache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208725 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/trunk@
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/trunk@
1208527 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 30 Nov 2011 16:56:50 +0000 (16:56 +0000)]
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/trunk@
1208517 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 30 Nov 2011 13:15:24 +0000 (13:15 +0000)]
use a style sheet... ideally we would pull one off the filesystem,
but for now...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208411 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 29 Nov 2011 22:28:21 +0000 (22:28 +0000)]
Remove more log message prefixes that are now redundant as the
the error log format includes the module name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208110 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Nov 2011 21:27:46 +0000 (21:27 +0000)]
mod_dbd: The dbd_prepared_init() function reported the result of the last
prepared statement, obscuring earlier errors. Fixed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208078 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Nov 2011 21:14:47 +0000 (21:14 +0000)]
Ensure casing doesn't matter... (we know balancer->s->name is
lc)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208069 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Nov 2011 21:14:08 +0000 (21:14 +0000)]
Some optimization... we have a hash, use it. Quicker than all
these string comparisons.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208068 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Nov 2011 21:14:03 +0000 (21:14 +0000)]
whitespace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1208067 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Nov 2011 17:20:24 +0000 (17:20 +0000)]
RPM: Add support for mod_lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1207977 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 29 Nov 2011 16:56:47 +0000 (16:56 +0000)]
RPM: Introduce a proper layout for RPM, removing the need for script
gymnastics and replacement configuration files in order to get the
configuration paths to match up correctly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1207968 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 29 Nov 2011 15:36:11 +0000 (15:36 +0000)]
Logic which makes the balancer "active" or not... so we can turn them
off and on as needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1207926 13f79535 -47bb-0310-9956-
ffa450edef68