]>
granicus.if.org Git - apache/log
Eric Covener [Wed, 10 Aug 2011 03:24:45 +0000 (03:24 +0000)]
remove (the only) retry logic in mod_authnz_ldap's authentication path
because it's causing the ample retries in mod_ldap to be multiplied by this
outter loop.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1156007 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 10 Aug 2011 02:06:52 +0000 (02:06 +0000)]
Try to obtain the specific LDAP error code returned during a failed
ldap_simple_bind().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1156001 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 8 Aug 2011 19:16:16 +0000 (19:16 +0000)]
two more blockers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1155061 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Aug 2011 12:36:39 +0000 (12:36 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154944 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Aug 2011 12:15:43 +0000 (12:15 +0000)]
document implicit limitation in AllowOverride Option=Foo -- this doesn't let you
"lock in" any value since the non +/- syntax can zap whatever it wants.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154940 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 8 Aug 2011 08:50:50 +0000 (08:50 +0000)]
Allow to explicitly disable modules even with module selection 'reallyall'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154875 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 8 Aug 2011 02:29:39 +0000 (02:29 +0000)]
Prevent a crash if a non-existent internal RewriteMap is specified
in a server context with RewiteEngine off, then later referenced.
Submitted By: Ben Noordhuis
Reviewed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154808 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Sun, 7 Aug 2011 21:10:20 +0000 (21:10 +0000)]
Typo fix (thanks to Tom Browder on users@)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154769 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 7 Aug 2011 20:48:17 +0000 (20:48 +0000)]
remove two obsolete or done items
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154762 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 7 Aug 2011 14:07:19 +0000 (14:07 +0000)]
PR46214: axe some misleading DEBUG messages in mod_authz_host.
Access is not necessarily denied because a single requirement failed to grant
access, and mod_authz_core is already reporting at DEBUG the require line and
the providers result.
Elaborate on one remaining legitimate message to include the require line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154706 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Aug 2011 10:36:57 +0000 (10:36 +0000)]
Enforce OpenSSL 0.9.7 as a minimum requirement in configure, and
remove #ifdef'ed code which was relevant for earlier versions only.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154688 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Aug 2011 10:34:31 +0000 (10:34 +0000)]
Remove the ssl_toolkit_compat layer, which is no longer needed
after support for non-OpenSSL toolkits has been dropped.
Replace macros by their value proper where feasible, and keep
those definitions in ssl_private.h which depend on specific
OpenSSL versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154687 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Aug 2011 10:29:09 +0000 (10:29 +0000)]
Drop support for the RSA BSAFE SSL-C toolkit from configure,
and remove #ifdef'ed code from mod_ssl and ab where applicable.
Consensus for dropping support for SSL/TLS toolkits other
than OpenSSL was reached on dev@httpd in June 2010 (message
with ID <
20100602162310 .GA11156@redhat.com> and follow-ups).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154683 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 6 Aug 2011 23:15:11 +0000 (23:15 +0000)]
PR29755: mod_usertrack gets skipped when modules return a status code from
their fixup hook, and headers are also not sent on non-2xx responses.
Submitted by: Sami J. Mäkinen
Reviewed by: Eric Covener (modified to just run REALLY_FIRST)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154620 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Aug 2011 19:06:58 +0000 (19:06 +0000)]
TRACEN loglevels are implemented in lua scripts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154354 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 5 Aug 2011 18:38:18 +0000 (18:38 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154344 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 5 Aug 2011 18:35:29 +0000 (18:35 +0000)]
mod_proxy_http, mod_proxy_connect: Add 'proxy-status' and 'proxy-source-port'
request notes for logging
PR: 30195
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154342 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Aug 2011 16:36:57 +0000 (16:36 +0000)]
went too far -- only other APR_HOOK_MIDDLE directives that aren't aware of
mod_lua.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154302 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Aug 2011 15:52:33 +0000 (15:52 +0000)]
explain some of the mystery quirks of the translate_name example, and introduce
one that does a more basic URI->filename.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154277 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Aug 2011 15:24:20 +0000 (15:24 +0000)]
change the example to work with just AddHandler/SetHandler,
and mention in a comment where the non-default function
name can be specified.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154265 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 5 Aug 2011 15:18:17 +0000 (15:18 +0000)]
add some text to the opening few sections of the mod_lua doc
explaining briefly why we're here.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154261 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 5 Aug 2011 08:45:28 +0000 (08:45 +0000)]
Simplify dependency checking code for mod_proxy_fdpass. This also fixes
mod_proxy_fdpass being built shared even with --enable-mods-static=reallyall.
Document bug/limitiation in APACHE_MODULE macro.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154126 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 5 Aug 2011 08:20:56 +0000 (08:20 +0000)]
Simplify mod_watchdog dependency checking code. This also fixes mod_watchdog
being built shared even with --enable-mods-static=reallyall.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154118 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 5 Aug 2011 08:01:31 +0000 (08:01 +0000)]
Enable ldap modules in 'all' and 'most' selections if ldap is compiled into
apr-util
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1154114 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 4 Aug 2011 08:04:20 +0000 (08:04 +0000)]
* modules/ssl/ssl_engine_dh.c: Fix indent args so the code
regeneration modifies the OpenSSL output correctly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153773 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 22:10:27 +0000 (22:10 +0000)]
Forbid some directives in .htaccess because of AllowOverrideList:
core: AllowOverride, AllowOverrideList
mod_authn_dbd: AuthDBDUserPWQuery, AuthDBDUserRealmQuery
mod_authz_dbd: AuthzDBDQuery, AuthzDBDRedirectQuery
mod_proxy: BalancerMember, ProxySet
Adjust for use in .htaccess:
mod_actions: Script
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153687 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 21:36:18 +0000 (21:36 +0000)]
cleanups related to new AllowOverrideList functionality:
- add new NOT_IN_HTACCESS flag for ap_check_cmd_context()
- describe the need for this in new_api_2_4.xml
- forbid Define and UnDefine in .htaccess
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153676 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 21:28:42 +0000 (21:28 +0000)]
Adjust some messages for <If> blocks and remove some dead code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153674 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 20:35:03 +0000 (20:35 +0000)]
use temp pool for temp string
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153653 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 3 Aug 2011 15:07:29 +0000 (15:07 +0000)]
* Do not even sent an empty brigade down the filter chain if the headers
have not been sent by the AJP server so far. Even an empty brigade
will trigger the headers filter to create the (in this case incomplete)
HTTP headers of the response.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153531 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 14:39:21 +0000 (14:39 +0000)]
Fix compiler warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153511 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 14:21:40 +0000 (14:21 +0000)]
Restore seealso enries for AllowOverride
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153500 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 14:18:41 +0000 (14:18 +0000)]
Update transforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153499 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 14:13:35 +0000 (14:13 +0000)]
Fix xml error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153497 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 3 Aug 2011 10:46:04 +0000 (10:46 +0000)]
Fix handling of offset in ap_send_fd()
PR: 51592
Submitted by: Torsten Foertsch <torsten foertsch gmx net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1153424 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 1 Aug 2011 21:48:03 +0000 (21:48 +0000)]
Fix endless loop if first bucket is metadata
PR: 51590
Submitted by: Torsten Foertsch <torsten foertsch gmx net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152943 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 1 Aug 2011 16:24:16 +0000 (16:24 +0000)]
And we are at 2.3.15-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152855 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 1 Aug 2011 16:22:39 +0000 (16:22 +0000)]
Get ready to tag 2.3.14
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152854 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 30 Jul 2011 10:58:34 +0000 (10:58 +0000)]
Improve logging for mod_proxy_ajp.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152452 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 30 Jul 2011 10:56:41 +0000 (10:56 +0000)]
Slightly reorganize previously unused dump method.
Add AJP packet log method on top of dump method.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152451 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 30 Jul 2011 10:54:04 +0000 (10:54 +0000)]
Make AJP trace messages a bit less cryptic.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152450 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 30 Jul 2011 10:49:32 +0000 (10:49 +0000)]
Move some debug log statements to trace level
and improve message format consistency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152448 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 29 Jul 2011 21:41:00 +0000 (21:41 +0000)]
mod_proxy_ajp: Respect "reuse" flag in END_REPONSE
packets.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152379 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Fri, 29 Jul 2011 15:40:19 +0000 (15:40 +0000)]
mod_proxy: enable absolute URLs to be rewritten with ProxyPassReverse,
e.g. to reverse proxy "Location: https://other-internal-server/login" with
ProxyPassReverse https://public-address/ https://other-internal-server/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152273 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 29 Jul 2011 11:56:26 +0000 (11:56 +0000)]
For consistency, makes the "Loaded Modules" section of the mod_info output into a top-level section, and provides a link to it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1152179 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 27 Jul 2011 22:24:14 +0000 (22:24 +0000)]
Add AllowOverrideList directive and documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151654 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 27 Jul 2011 14:49:29 +0000 (14:49 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151485 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 27 Jul 2011 14:46:12 +0000 (14:46 +0000)]
document ProxySourceAddress
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151484 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 27 Jul 2011 08:03:41 +0000 (08:03 +0000)]
Use ap_unescape_url_keep2f() in ap_expr unescape func. ap_unescape_url()
forbidding encoded slashes is not useful here.
Log failures.
Improve docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151373 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 27 Jul 2011 07:23:35 +0000 (07:23 +0000)]
Use ap_document_root() in ap_core_translate() to allow modules like
mod_vhost_ldap let core do the name translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151361 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 26 Jul 2011 20:37:49 +0000 (20:37 +0000)]
Install signal handlers for crashes before detaching. Previously, there
was a time span where crashes would be neither visible on the console nor
logged in the error log.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151234 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 26 Jul 2011 20:36:56 +0000 (20:36 +0000)]
Reduce period during startup and restart where a successive signal may be lost
PR: 43696
Submitted by: Arun Bhalla <arun shme net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151233 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 26 Jul 2011 16:17:07 +0000 (16:17 +0000)]
Docs for mod_allowmethods: Clarify GET and HEAD
are synonymous, switch example to "Location".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151151 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 26 Jul 2011 16:11:33 +0000 (16:11 +0000)]
Clarify docs for mod_allowmethods: you still
need to use TraceEnable to forbid TRACE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151149 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 26 Jul 2011 15:55:14 +0000 (15:55 +0000)]
"Changes absolutely nothing" doesn't look like
a useful directive description ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151145 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 26 Jul 2011 15:52:40 +0000 (15:52 +0000)]
mod_allowmethods: Correct Merging of "reset" and do
not allow an empty parameter list for the
AllowMethods directive.
Furthermore switch from AP_MODULE_DECLARE_DATA
to AP_DECLARE_MODULE (the module was brought in
after the big logging refactoring).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151143 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 26 Jul 2011 09:47:51 +0000 (09:47 +0000)]
Document the weird semantics of ap_find_command_in_modules()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1151045 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 25 Jul 2011 22:39:14 +0000 (22:39 +0000)]
This functionality is available when the module is *loaded* into the server, not *compiled* into the server.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150943 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 25 Jul 2011 13:07:18 +0000 (13:07 +0000)]
Missing "}" in example.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150682 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 25 Jul 2011 07:08:33 +0000 (07:08 +0000)]
* Make trunk compile with APR trunk again (without LDAP support of course), by
ensuring that we only include the include files of the APR / APU LDAP API if
we use 1.x. Move stuff that depends on it inside the APR_HAS_LDAP block.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150559 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 24 Jul 2011 19:19:44 +0000 (19:19 +0000)]
Add a CHANGES entry for all the module selection changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150474 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 24 Jul 2011 19:14:25 +0000 (19:14 +0000)]
enable mod_lua at level 'all' if the dependencies are present
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150473 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 24 Jul 2011 19:06:59 +0000 (19:06 +0000)]
enable mod_ssl at level 'most'
Let's assume that if a system has the openssl dev headers installed in
the default location, it is very unlikely that crypto is forbidden in
the country that the system is located in.
If no ssl toolkit is found, disable mod_ssl instead of aborting.
The actual change is small, use 'diff -b' to review
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150471 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 24 Jul 2011 18:59:25 +0000 (18:59 +0000)]
adjust mod_proxy build defaults:
Change the default for mod_proxy from 'reallyall' to 'most'.
Most mod_proxy_* modules default to whatever mod_proxy is set to.
Do this for mod_proxy_express, too (was explicit 'most').
Change mod_proxy_mods_fdpass to explicit 'all'.
See thread at
http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%
3C201107052321 .56063.sf@sfritsch.de%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150467 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 24 Jul 2011 18:57:17 +0000 (18:57 +0000)]
Enable mod_session_crypt if deps are fulfilled and mod_session is
enabled
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150466 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 24 Jul 2011 18:56:17 +0000 (18:56 +0000)]
Don't fail if a module is selected for 'most' or 'all' but the dependencies
are not fulfilled
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150464 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 23 Jul 2011 22:24:55 +0000 (22:24 +0000)]
Bring part some parts of r1142938 which were removed
by the big ldap revert r1150179.
Original commit log:
Use APR_ADDTO instead of APR_SETVAR or direct
variable assignment.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150231 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:49:04 +0000 (17:49 +0000)]
Merge branch revert-ap-ldap:
Revert ap_ldap integration due to veto by Graham Leggett
Mailing list threads:
http://mail-archives.apache.org/mod_mbox/httpd-dev/201106.mbox/%
3C4192DC1D -C0B9-42BB-B614-
C3A41290F18B @sharp.fm%3E
http://mail-archives.apache.org/mod_mbox/httpd-dev/201107.mbox/%
3C4E15E51E .
4090700 @rowe-clan.net%3E
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150179 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:32:24 +0000 (17:32 +0000)]
Add change log entry, bump MMN
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150173 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:29:42 +0000 (17:29 +0000)]
Revert r1129808:
Incorporate the ap_ldap incomplete API, as there is no interest or effort
at APR to make this a complete abstraction, and it was voted 'off the island'
with APR 2.0. This will allow httpd 2.3 to build against either apr-2.0
or apr+util 1.x.
This also reverts part of r1142938, which needs to be re-done.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150172 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:21:02 +0000 (17:21 +0000)]
Revert r1129886:
Shift declaration logic of LDAP_DECLARE to ap_ldap.h from util_ldap.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150169 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:19:55 +0000 (17:19 +0000)]
Revert r1129891:
LDAP_DECLARE Header adjustment for nw/win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150168 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:19:04 +0000 (17:19 +0000)]
Revert r1129956:
Fix include path relative to modules/ldap/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150167 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:18:15 +0000 (17:18 +0000)]
Revert r1130186:
PR51307: Fix ldap_rebind build error when ldap is enabled and APR is built without threads.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150166 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:16:54 +0000 (17:16 +0000)]
Revert r1131393:
Several fixes for the ap_ldap build logic. This should fix compilation
without --with-ldap.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150165 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:10:49 +0000 (17:10 +0000)]
Revert r1140069:
Fix load order dependencies in LDAP code by switching to use of APR
optional functions for the inter-module API...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150164 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:09:19 +0000 (17:09 +0000)]
Revert r1140075:
Pick up the license notices from the LDAP code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150163 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:08:43 +0000 (17:08 +0000)]
Revert r1141201:
Fix compilation error due to missing LDAP_DECLARE definition
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150162 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:07:41 +0000 (17:07 +0000)]
Revert r1141203:
remove ap_ldap.h in make distclean
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150161 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:06:55 +0000 (17:06 +0000)]
Revert r1143221:
No tabs please.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150160 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:06:01 +0000 (17:06 +0000)]
Revert r1143222:
Added creating ap_ldap.h for NetWare.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150159 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:04:57 +0000 (17:04 +0000)]
Revert r1143225:
Removed define which is now in ap_ldap.h.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150158 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 23 Jul 2011 17:00:37 +0000 (17:00 +0000)]
start a branch for the revert of the ap_ldap integration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/revert-ap-ldap@
1150157 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Jul 2011 15:21:53 +0000 (15:21 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1150122 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 21 Jul 2011 14:47:32 +0000 (14:47 +0000)]
Rebuild transformations and various recent doc changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1149203 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 21 Jul 2011 13:56:27 +0000 (13:56 +0000)]
"(!)" in the middle of a sentence is confusing, as it doesn't actually
communicate anything.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1149182 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 21 Jul 2011 13:54:38 +0000 (13:54 +0000)]
Fix XML error and rebuild changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1149177 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 21 Jul 2011 13:44:00 +0000 (13:44 +0000)]
Small clarifications, as per tid 50730
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1149174 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 20 Jul 2011 12:44:09 +0000 (12:44 +0000)]
Added new proxy modules to NetWare build.
Submitted by: NormW <normw gknw net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1148734 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 18 Jul 2011 22:31:04 +0000 (22:31 +0000)]
Added forgfotten .dsp bits - my bad.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1148078 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 18 Jul 2011 11:58:43 +0000 (11:58 +0000)]
Added new mods to Windows build system.
Submitted by: Gregg L. Smith <gls gknw net>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147823 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 18 Jul 2011 10:47:49 +0000 (10:47 +0000)]
* server/vhost.c (get_addresses): For '*' and '_default_', return
address(es) for any address family, not IPv4 only.
(dump_a_vhost): Use '*' for v4 or v6 wildcard address.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147806 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 17 Jul 2011 16:33:03 +0000 (16:33 +0000)]
Simplify code by using apr_array_pstrcat()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147680 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 17 Jul 2011 13:56:28 +0000 (13:56 +0000)]
Make the SERVER_NAME variable include [ ] for literal IPv6 addresses, as
mandated by RFC 3875
PR: 26005
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147614 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 17 Jul 2011 08:52:35 +0000 (08:52 +0000)]
Fix parsing of Content-Length in type maps
PR: 42203
Submitted by: Nagae Hidetake <nagae eagan jp>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147557 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 16 Jul 2011 21:53:18 +0000 (21:53 +0000)]
Add more (trace) logging to the ap_scan_script_header*() functions
Add ap_scan_script_header*_ex() functions that take a module index for
logging.
Make mod_cgi, mod_cgid, mod_proxy_fcgi, mod_proxy_scgi, mod_isapi use the
new functions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147493 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 16 Jul 2011 20:36:11 +0000 (20:36 +0000)]
improve readability of 'malformed header from script' message and simplify code
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147487 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Jul 2011 16:08:13 +0000 (16:08 +0000)]
Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147445 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Jul 2011 16:06:43 +0000 (16:06 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147444 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Jul 2011 23:02:06 +0000 (23:02 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1147343 13f79535 -47bb-0310-9956-
ffa450edef68