]>
granicus.if.org Git - apache/log
Jeff Trawick [Wed, 29 Feb 2012 01:52:17 +0000 (01:52 +0000)]
Fix MPM DSO load failure on AIX.
Without the proper AP_DECLARE*, these functions used by MPMs
were not exported from httpd on AIX, resulting in symbol
resolution errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1294936 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Tue, 28 Feb 2012 06:01:23 +0000 (06:01 +0000)]
properly free the GENERAL_NAMEs, as pointed out in PR 32652
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1294471 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 Feb 2012 22:31:32 +0000 (22:31 +0000)]
AIX: Add missing build scripts.
Submitted by: Michael Felt <mamfelt gmail com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1294372 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 Feb 2012 22:24:18 +0000 (22:24 +0000)]
AIX: Update the build to support AIX packages.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1294367 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 27 Feb 2012 22:08:52 +0000 (22:08 +0000)]
Add the port number to the vhost's name in the scoreboard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1294358 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 27 Feb 2012 22:04:54 +0000 (22:04 +0000)]
Take care not to call ap_start_lingering_close from the listener thread,
because it may block when flushing data to the client.
From the listener thread, do a lingering close without flushing. This is
OK because we only do this if there has been an error during write
completion or if our send buffers are empty because we are in keep-alive.
PR: 52229
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1294356 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 27 Feb 2012 21:45:18 +0000 (21:45 +0000)]
Prevent listener thread from ever updating a worker's scoreboard slot
The worker may be doing something else by now. This should take
care of slots staying in "L" state in the scoreboard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1294349 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 27 Feb 2012 20:01:40 +0000 (20:01 +0000)]
Initialize EC temporary key on server startup, as for DH and
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1294306 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 25 Feb 2012 22:51:33 +0000 (22:51 +0000)]
Pass the EOS bucket down the filter chain
PR: 52766
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293717 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 25 Feb 2012 22:15:42 +0000 (22:15 +0000)]
Enable per-module loglevel for mod_xml2enc and mod_proxy_html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293708 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 25 Feb 2012 20:32:29 +0000 (20:32 +0000)]
Add a section to the mod_session documentation that better describes how to integrate
applications with mod_session.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293678 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 25 Feb 2012 18:10:56 +0000 (18:10 +0000)]
mod_session: Sessions are encoded as application/x-www-form-urlencoded strings, however we
do not handle the encoding of spaces properly. Fixed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293658 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Feb 2012 16:59:06 +0000 (16:59 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293650 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 25 Feb 2012 05:30:43 +0000 (05:30 +0000)]
Fix another compiler warning
Submitted by: Daniel Shahaf <danielsh elego de>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293535 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 25 Feb 2012 05:28:11 +0000 (05:28 +0000)]
Fix compiler warning
Submitted by: Daniel Shahaf <danielsh elego de>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293534 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 24 Feb 2012 21:27:37 +0000 (21:27 +0000)]
Fix MMN in comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293427 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 24 Feb 2012 21:27:13 +0000 (21:27 +0000)]
Revert Paul's lock free circular queue changes done on MPM-event.
The changes have been moved to branches/mpm-event-optimization.
This puts trunk's MPM-event back to the state of 2.4.x, except for serf
support.
The following commits are reverted:
------------------------------------------------------------------------
r1203404 | trawick | 2011-11-17 23:48:35 +0100
event no longer requires APR_POLLSET_THREADSAFE, or any
other non-standard feature (all but OS/2 have APR_POLLSET_WAKEABLE)
config-foo: don't require thread-safe pollset in order to
build event
event.c: don't stress APR_ENOTIMPL in apr_pollset_create errors;
just give the standard "check system or user limits"
message
------------------------------------------------------------------------
r1203858 | trawick | 2011-11-18 22:39:33 +0100
follow up to r1202257 -- perform normal wakeup processing when
APR_EINTR is seen from apr_pollset_poll(), with expectation that
it was triggered by apr_pollset_wakeup()
------------------------------------------------------------------------
r1202395 | trawick | 2011-11-15 20:38:31 +0100
spellcheck r1202258
------------------------------------------------------------------------
r1202329 | pquerna | 2011-11-15 18:47:33 +0100
Calculate the power of two size of the buffer before allocating it.
Spotted by: Rüdiger Plüm
------------------------------------------------------------------------
r1202259 | pquerna | 2011-11-15 16:52:59 +0100
Use apr_pollset_wakeup to ensure that the listener thread will process most enqueue'd events quickly
------------------------------------------------------------------------
r1202258 | pquerna | 2011-11-15 16:52:00 +0100
Because the pollset is now only mutated from the event thread, we no longer need the APR_POLLSET_THREADSAFE flag for the event_pollset
------------------------------------------------------------------------
r1202257 | pquerna | 2011-11-15 16:51:03 +0100
Create a new lock free circular queue, and use it in the EventMPM to remove the timeout mutex that was wrapping both timeout queue operations and pollset operations.
------------------------------------------------------------------------
r1202256 | pquerna | 2011-11-15 16:50:09 +0100
Instead of disabling the listening sockets from the pollset when under load, just stop calling the accept call, but leave the sockets in the pollset.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293426 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 24 Feb 2012 20:47:01 +0000 (20:47 +0000)]
In maintainer mode, replace apr_palloc with a version that
initializes the allocated memory with non-zero values, except if
AP_DEBUG_NO_ALLOC_POISON is defined.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293408 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 24 Feb 2012 20:42:24 +0000 (20:42 +0000)]
Fix AddOutputFilterByType brown paper bag crash bug
Initialize pointers, fix off-by-one.
PR: 52755
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293405 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 24 Feb 2012 03:12:53 +0000 (03:12 +0000)]
Internal link to the right section.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1293065 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Thu, 23 Feb 2012 17:46:42 +0000 (17:46 +0000)]
Adding .fr translation for mod_lua
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1292866 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 21 Feb 2012 21:36:37 +0000 (21:36 +0000)]
Add AP_HAVE_C99 to make correct check for C99 less onerous
Using __STDC_VERSION__ without checking if it is defined causes warnings
on C89.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1292043 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 21 Feb 2012 15:04:39 +0000 (15:04 +0000)]
Fix a link in the caching guide.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1291840 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 21 Feb 2012 15:01:20 +0000 (15:01 +0000)]
Mention the rewritten Caching Guide.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1291834 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 21 Feb 2012 14:49:42 +0000 (14:49 +0000)]
Mention the CACHE filter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1291820 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 21 Feb 2012 14:33:52 +0000 (14:33 +0000)]
Rebuild html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1291813 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 21 Feb 2012 14:30:33 +0000 (14:30 +0000)]
Highlight some of the improvements in the documentation in the 2.4 version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1291801 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 21 Feb 2012 13:26:37 +0000 (13:26 +0000)]
generated files from r1291766
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1291768 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 21 Feb 2012 13:26:06 +0000 (13:26 +0000)]
apply insufficient TLC, making some improvements to wording
and typography
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1291766 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 18 Feb 2012 18:04:29 +0000 (18:04 +0000)]
Reordering:
Put related changes next to each other
Put modules that only provide services for other modules last
Try to put important changes first
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1290835 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 18 Feb 2012 17:38:54 +0000 (17:38 +0000)]
Mention AllowOverrideList, Define, EC keys, rotatelogs improvements.
Syntax fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1290823 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 17 Feb 2012 19:29:12 +0000 (19:29 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1245719 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 17 Feb 2012 19:28:11 +0000 (19:28 +0000)]
Mention mod_heartmonitor/mod_lbmethod_heartbeat, mod_sed, mod_auth_form,
mod_session.
Remove mod_reqtimeout (already in 2.2), mark mod_lua as experimental.
Mention more mod_rewrite improvements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1245717 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 14 Feb 2012 21:18:22 +0000 (21:18 +0000)]
Make sure the getsfunc_*() functions used by ap_scan_script_header_err*()
NUL-terminate the resulting string, even in case of an error. mod_cgi
and mod_cgid try to log incomplete output from CGI scripts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1244211 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 14 Feb 2012 07:14:26 +0000 (07:14 +0000)]
To early, not enough drugs, sorry for the noise.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243799 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 14 Feb 2012 07:11:36 +0000 (07:11 +0000)]
Fix out of tree build with srclib apr.
Fix error message for included apr flag.
Forward port of r1241897 and r1243670
from 2.4.x plus one shell syntax fix.
Will backport the fix to 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243797 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Feb 2012 02:57:39 +0000 (02:57 +0000)]
Rebuilds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243771 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 14 Feb 2012 02:56:33 +0000 (02:56 +0000)]
Removes references to how things used to be in 2.0.x, and makes
necessary rephrasings to compensate for those references.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243769 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 13 Feb 2012 18:50:16 +0000 (18:50 +0000)]
Check during config test that directories for access logs exist
PR 29941
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243651 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Mon, 13 Feb 2012 03:22:51 +0000 (03:22 +0000)]
missing modules/ folders in lbmethod modules
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243404 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 12 Feb 2012 16:17:50 +0000 (16:17 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243274 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 12 Feb 2012 16:08:31 +0000 (16:08 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243272 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 12 Feb 2012 12:44:16 +0000 (12:44 +0000)]
Fix regression introduced in r1222917: in ssl_find_vhost(), we must use
the *new* SSL_CTX settings for the SSL_set_options/SSL_set_verify calls.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243246 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 11 Feb 2012 22:45:37 +0000 (22:45 +0000)]
BZ 52623: Fix building against PCRE 8.30.
PCRE dropped support for pcre_info() which is
deprecated since a long time. Use pcre_fullinfo()
instead, which exists since version 3.0 of PCRE.
Patch provided by Ruediger Pluem.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1243176 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 10 Feb 2012 22:45:48 +0000 (22:45 +0000)]
Fix spelling.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242967 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 20:59:21 +0000 (20:59 +0000)]
add manpage list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242919 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 20:26:42 +0000 (20:26 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242914 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 20:19:47 +0000 (20:19 +0000)]
fix validation error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242913 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 20:17:46 +0000 (20:17 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242910 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 10 Feb 2012 20:11:47 +0000 (20:11 +0000)]
fixup properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242907 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 10 Feb 2012 14:52:25 +0000 (14:52 +0000)]
* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response):
Treat EAGAIN as an error for a blocking read from the input filter
stack.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242798 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 20:28:57 +0000 (20:28 +0000)]
Remove duplicated word
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242508 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 19:47:11 +0000 (19:47 +0000)]
Rebuild xdoc
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242484 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 19:46:40 +0000 (19:46 +0000)]
Replaces more occurences of 'Apache' with 'Apache httpd'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242483 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 19:39:39 +0000 (19:39 +0000)]
Replaces uses of 'Apache' with 'Apache httpd'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242479 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 9 Feb 2012 19:39:01 +0000 (19:39 +0000)]
Trivial typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242478 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 9 Feb 2012 15:13:23 +0000 (15:13 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242356 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 9 Feb 2012 15:07:22 +0000 (15:07 +0000)]
Handle cases, esp when using mod_proxy_fcgi, when we do not
want SCRIPT_FILENAME to include the query string.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242351 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 8 Feb 2012 21:02:20 +0000 (21:02 +0000)]
Add cleanup for SSLProxyMachineCertificateChainFile during init
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1242089 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 6 Feb 2012 16:46:39 +0000 (16:46 +0000)]
Based on feedback from Vincent from the docs team, change the examples
to ones that correspond with our default values.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1241071 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 6 Feb 2012 16:40:32 +0000 (16:40 +0000)]
Bah. The word is "whereas", not "where as"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1241069 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 6 Feb 2012 16:36:28 +0000 (16:36 +0000)]
Fixes issue 52604. Depending on the value of @rel_logfiledir@ the
example may or may not start with a "/", rendering the example wrong in
some cases, as described in that bugzilla issue. Changes the example to
literal strings so there can be no ambiguity.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1241066 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 5 Feb 2012 19:23:45 +0000 (19:23 +0000)]
aix: Add a set of build scripts that make packages suitable for installp
on the AIX platform.
Submitted by: Michael Felt <mamfelt gmail com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1240778 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 4 Feb 2012 09:44:19 +0000 (09:44 +0000)]
Replace ap_create_core_ctx()/ap_core_ctx_get_bb() with a hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1240470 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 3 Feb 2012 23:00:37 +0000 (23:00 +0000)]
Note some directives that are lacking documenation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1240384 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 3 Feb 2012 19:48:01 +0000 (19:48 +0000)]
Fix various filter functions to return apr_status_t instead of int
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1240315 13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Fri, 3 Feb 2012 14:13:23 +0000 (14:13 +0000)]
Fix PR52402. Check if the shared memory was already created for this proxy_server_conf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1240181 13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Fri, 3 Feb 2012 13:53:20 +0000 (13:53 +0000)]
oops, this got forgotten when copy/paste from dev branch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1240171 13f79535 -47bb-0310-9956-
ffa450edef68
Mladen Turk [Fri, 3 Feb 2012 13:47:59 +0000 (13:47 +0000)]
C/C++ 101 on how to traverse the array of pointers ;). Fix core
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1240164 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 3 Feb 2012 01:54:42 +0000 (01:54 +0000)]
Typo correction. Rebuild xhtml transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239978 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Fri, 3 Feb 2012 01:52:01 +0000 (01:52 +0000)]
Typo correction - s/Availabe/Available/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239977 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Feb 2012 21:52:12 +0000 (21:52 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239873 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Feb 2012 21:51:36 +0000 (21:51 +0000)]
revert "overloaded" recent additions to mod_rewrite
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239872 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Feb 2012 19:31:44 +0000 (19:31 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239779 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Feb 2012 19:31:01 +0000 (19:31 +0000)]
document a small trunk-only mod_rewrite indulgence
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239778 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Feb 2012 15:57:51 +0000 (15:57 +0000)]
bump
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239684 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Feb 2012 15:51:09 +0000 (15:51 +0000)]
add an internal sleep map function that expands to an empty string.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239681 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 2 Feb 2012 15:43:41 +0000 (15:43 +0000)]
treat a rewriterule substitution that expands to "-" as if the rule
had a literal "-".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239679 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 2 Feb 2012 14:17:06 +0000 (14:17 +0000)]
Rebuilds various other modifications from the last few days.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239636 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 2 Feb 2012 14:16:10 +0000 (14:16 +0000)]
Rebuild html
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239635 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 2 Feb 2012 14:14:00 +0000 (14:14 +0000)]
Typo fix, courtesy of humbedooh AT humbedooh.com - Daniel Gruno
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239634 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 2 Feb 2012 12:02:54 +0000 (12:02 +0000)]
Add a configuration layout for the AIX platform.
Submitted by: Michael Felt <mamfelt gmail com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239565 13f79535 -47bb-0310-9956-
ffa450edef68
Nick Kew [Wed, 1 Feb 2012 15:40:03 +0000 (15:40 +0000)]
Document AllowOverride Nonfatal option
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239174 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 11:16:34 +0000 (11:16 +0000)]
Fix parallel installation for static modules
builds. When "$(shared)" was empty, instdso.sh
complained with a Usage message.
Don't call instdso, if there's nothing to install.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239075 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 11:12:02 +0000 (11:12 +0000)]
Forgot to bump MMN when advancing the
MODULE_MAGIC_COOKIE for trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239073 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 11:08:59 +0000 (11:08 +0000)]
No need for multi-version compatibility.
Broke trunk, because the COOKIE was advanced
to "AP25".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239071 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 09:54:25 +0000 (09:54 +0000)]
Note a TODO for Lua 5.2.0 compatibility.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239031 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 09:51:59 +0000 (09:51 +0000)]
Remove luaL_reg macro definition no longer needed
and simplify lua_load compatibility macro.
Note that in order to successfully compile with
Lua 5.2.0 we still need to add LUA_COMPAT_ALL
to CPPFLAGS. Detection in config.m4 is still
missing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239030 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 09:50:14 +0000 (09:50 +0000)]
luaL_reg was already deprecated in Lua 5.1.4.
It is gone in Lua 5.2.0 and was replaced by luaL_Reg
which already existed in 5.1.4. So use that one..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239029 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 09:47:53 +0000 (09:47 +0000)]
Minor fixes for firehose and mod_policy:
- err.h does not exist in Solaris. Judging
from the expected content of err.h we don't
use it at all, so remove inclusion of it.
- The name DEFAULT_TYPE is to generic. Use
POLICY_DEFAULT_TYPE instead.
- Include apr header files from configured
path instead of system path.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239027 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 09:45:12 +0000 (09:45 +0000)]
Addition to r1237447: "for arg ; do" is not
sh standard. It seems its a shortcut for
"for arg in "$@" ; do".
Detected on Solaris with very restricted /bin/sh.
Seems to work fine for arguments with embedded
whitespace.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1239026 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 1 Feb 2012 07:50:42 +0000 (07:50 +0000)]
Add a few placeholders to CHANGES for items which
are currrently trunk only.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238979 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 1 Feb 2012 03:49:14 +0000 (03:49 +0000)]
Sorry about that. Wasnt looking in the right place.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238930 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Wed, 1 Feb 2012 03:31:50 +0000 (03:31 +0000)]
Make apachectl -h aware of status, fullstatus, and configtest.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238924 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 1 Feb 2012 02:38:27 +0000 (02:38 +0000)]
Fixed c&p error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238908 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 31 Jan 2012 21:53:17 +0000 (21:53 +0000)]
Revert r1202255 to restore same behavior as in 2.4:
disable mod_reqtimeout if not configured
There is some agreement that 2.4's behavior is fine.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238826 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 31 Jan 2012 21:39:05 +0000 (21:39 +0000)]
Note some things that should be considered, but not shortly before a release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238821 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 20:54:22 +0000 (20:54 +0000)]
Remove changes from trunk CHANGES that have already
been backported to 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238810 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 20:51:11 +0000 (20:51 +0000)]
Fix typo which was already fixed in 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238808 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 31 Jan 2012 19:43:10 +0000 (19:43 +0000)]
Remove unwanted tanslation leftover.
Was introduced in r1210120.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1238768 13f79535 -47bb-0310-9956-
ffa450edef68