]>
granicus.if.org Git - apache/log
Rich Bowen [Mon, 8 Oct 2012 13:39:27 +0000 (13:39 +0000)]
Rebuild HTML and translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395560 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Mon, 8 Oct 2012 13:35:52 +0000 (13:35 +0000)]
Thanks to Daniel, further enhance the explanation of the decision of the default MPM.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395555 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 7 Oct 2012 22:59:14 +0000 (22:59 +0000)]
Adds some clarification to the statement that the default MPM is
selected based on platform capabilities.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395417 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 7 Oct 2012 09:10:14 +0000 (09:10 +0000)]
Optionally read passwords from stdin
PR: 40243
Submitted by: Adomas Paltanavicius <adomas paltanavicius gmail com>, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395256 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 7 Oct 2012 09:06:10 +0000 (09:06 +0000)]
add support for bcrypt
PR: 49288
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395255 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 7 Oct 2012 09:03:51 +0000 (09:03 +0000)]
Add passwd_common.c build support for Windows and Netware
Completely untested - please test
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395254 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 7 Oct 2012 09:02:19 +0000 (09:02 +0000)]
Start refactoring of htpasswd and htdbm
- Move many common code parts into separate source file. This adds some
of htpasswd's recent improvements to htdbm.
- Rework salt generation to use the full 48bit of entropy for MD5
Previously, it would only generate 2^32 different salts on a given
platform.
- Use apr_getopt().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395253 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 7 Oct 2012 08:56:45 +0000 (08:56 +0000)]
Fix usage of MOD_* variables for MPM modules
r1385216 broke building of mpm event with serf support. To fix,
* introduce APACHE_MPMPATH_INIT/FINISH similar to
APACHE_MODPATH_INIT/FINISH to create modules.mk and add
MOD_* vars to it.
* change APACHE_MPM_MODULE to only append to modules.mk, not
overwrite
* add APACHE_MPMPATH_INIT/FINISH to all MPMs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395252 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Oct 2012 06:26:53 +0000 (06:26 +0000)]
Allow forced setting of TLS1.1 and TLS1.2 protocols with
the -f command-line switch, and adapt the output to more accurately
report what SSL/TLS protocol was negotiated (use SSL_get_version()
instead of SSL_CIPHER_get_version()).
PR: 53916
Submitted by: Nicolás Pernas Maradei <nico emutex com>
Reviewed/amended by: Kaspar Brand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395225 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 7 Oct 2012 00:07:05 +0000 (00:07 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395193 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Oct 2012 14:57:27 +0000 (14:57 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1395079 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 6 Oct 2012 10:36:55 +0000 (10:36 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1394986 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 6 Oct 2012 10:35:25 +0000 (10:35 +0000)]
German translation:
Note that AllowOverride changed its default value to None in 2.3.9
As per comment #264 on site.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1394984 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Oct 2012 22:05:01 +0000 (22:05 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1394838 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 5 Oct 2012 22:03:57 +0000 (22:03 +0000)]
Also note that RewriteCond directives have to match for the skip flag to work.
Reported at http://httpd.apache.org/docs/2.2/rewrite/flags.html#comment_322
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1394837 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 4 Oct 2012 20:42:25 +0000 (20:42 +0000)]
Updating powered-by images to reflect the consensus on dev@ ML.
Please do review and say if this is what we want, and I'll backport if so.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1394254 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 13:59:28 +0000 (13:59 +0000)]
update xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1394080 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 4 Oct 2012 13:57:17 +0000 (13:57 +0000)]
update doccos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1394079 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 4 Oct 2012 11:44:34 +0000 (11:44 +0000)]
* modules/arch/unix/mod_systemd.c (systemd_pre_mpm): Simplify code
slightly; no functional change.
Use AP_DECLARE_MODULE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393997 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 4 Oct 2012 10:12:41 +0000 (10:12 +0000)]
* modules/arch/unix/mod_systemd.c: New module.
Submitted by: Jan Kaluza <jkaluza redhat.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393976 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 3 Oct 2012 19:10:02 +0000 (19:10 +0000)]
property fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393688 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 3 Oct 2012 19:04:23 +0000 (19:04 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393682 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 3 Oct 2012 15:49:17 +0000 (15:49 +0000)]
Fix spelling mistakes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393564 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 3 Oct 2012 09:53:42 +0000 (09:53 +0000)]
Getting rid of the animated PB icon that spells out "2.2", times they are a'changin'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393379 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 3 Oct 2012 08:20:50 +0000 (08:20 +0000)]
Extract some more data through the server load API:
* include/httpd.h (struct ap_sload_t): Add bytes_served, access_count
fields.
* server/util.c (ap_get_sload): Fill in those fields.
Submitted by: Jan Kaluza <jkaluza redhat.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393338 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 2 Oct 2012 20:10:21 +0000 (20:10 +0000)]
mod_auth_form: Make sure that get_notes_auth() sets the user as does
get_form_auth() and get_session_auth(). Makes sure that REMOTE_USER
does not vanish during mod_include driven subrequests.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393152 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 2 Oct 2012 17:41:00 +0000 (17:41 +0000)]
mod_include: When an include file or virtual path fails, include the result
code that tells us why.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393058 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 2 Oct 2012 17:02:44 +0000 (17:02 +0000)]
mod_include: When +Includes is not set and we disable mod_include, tell
the administrator where this happened.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1393033 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 2 Oct 2012 15:34:23 +0000 (15:34 +0000)]
Updating the 'powered by' icons to both say 2.4 as well as use Apache 2.0 licensed fonts only.
SVG version also added, in case someone wants to use/change/reproduce the icons.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392973 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 2 Oct 2012 11:33:34 +0000 (11:33 +0000)]
follow up to r1387633: use the right exit code depending on the error scenario
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392850 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 1 Oct 2012 14:20:37 +0000 (14:20 +0000)]
core: ErrorDocument now works for requests without a Host header.
PR: 48357
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392347 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 1 Oct 2012 14:14:56 +0000 (14:14 +0000)]
and allow the xml param
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392346 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 1 Oct 2012 14:14:53 +0000 (14:14 +0000)]
Bring XML output up to snuff for balancer-manager
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392345 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Mon, 1 Oct 2012 05:36:39 +0000 (05:36 +0000)]
Added mod_cache_socache to NetWare build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392214 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 1 Oct 2012 00:46:15 +0000 (00:46 +0000)]
--with-module: Fix failure to integrate them into some existing
module directories.
modules/config?.m4 needs to run after the modules/*/config?.m4.
Otherwise, modules.mk as created for --with-module gets wiped
out first.
PR: 40097
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392150 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 30 Sep 2012 22:43:29 +0000 (22:43 +0000)]
fix bug in r1392120: replace ALL commas
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392122 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 30 Sep 2012 21:55:13 +0000 (21:55 +0000)]
Fix shell errors when trying to AC_MSG_RESULT() for --with-module.
(The change to IFS hosed any AC_MSG_foo() invocations.)
It is easy enough to reorder the reset of IFS and the AC_MSG_RESULT()
invocation, but there's a big stretch of shell code where AC_MSG_foo()
might be useful someday, so get rid of the commas at the start and
leave IFS alone and AC_MSG_foo() at will.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1392120 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Sep 2012 14:40:52 +0000 (14:40 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1391815 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Sep 2012 13:59:45 +0000 (13:59 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1391801 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 29 Sep 2012 08:44:53 +0000 (08:44 +0000)]
Add CGI sample to show how JScript can be used (BZ51359).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1391773 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 29 Sep 2012 08:29:20 +0000 (08:29 +0000)]
Changed WScript.Echo to WScript.StdOut.WriteLine because
WScript.Echo seems to mess up output with Locale;
avoid Split() usage since it seems not consistent with
all versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1391772 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 29 Sep 2012 08:25:21 +0000 (08:25 +0000)]
Fixed comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1391771 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 28 Sep 2012 11:40:26 +0000 (11:40 +0000)]
RPM: Add mod_cache_socache to the RPM spec file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1391404 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 28 Sep 2012 11:10:06 +0000 (11:10 +0000)]
Apply proper APLOGNO codes for mod_cache_socache.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1391398 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 28 Sep 2012 11:05:55 +0000 (11:05 +0000)]
Fix the return values on mod_cache_socache's store_headers() implementation
to return APR errors codes and not DECLINED. We are committed to using this
implementation by this point, and any error should force us to stand down.
Submitted by: trawick
Reviewed by: minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1391396 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 26 Sep 2012 15:28:27 +0000 (15:28 +0000)]
wrap var inits in the macro w/ a do-while.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1390564 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 26 Sep 2012 15:24:23 +0000 (15:24 +0000)]
More accurate counts of busy and ready/idle
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1390562 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 21:02:40 +0000 (21:02 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389580 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 21:01:01 +0000 (21:01 +0000)]
mod_header changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389575 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 20:59:09 +0000 (20:59 +0000)]
Document these new funcs and make it API aware
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389573 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 20:55:17 +0000 (20:55 +0000)]
Document new mod_headers params: %l, %i, %b
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389569 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 20:51:03 +0000 (20:51 +0000)]
Might as well show 'em all
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389566 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 20:51:00 +0000 (20:51 +0000)]
Allow for exposure of loadavg and server load via mod_headers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389565 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 20:50:58 +0000 (20:50 +0000)]
Break out loadavg from Apache load.... one is quick, the other
isn't so much, and so why load things up when wanting just
the server loadavg?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389564 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 18:17:50 +0000 (18:17 +0000)]
minor name change, but I expect most will just want/need/use
the current load average, so simplify the name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389506 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 24 Sep 2012 16:56:58 +0000 (16:56 +0000)]
Would be nice to have some sort of canonical definition
of server loading for Apache. So create a struct that
holds some useful data. The hope is that for those
platforms that lack getloadavg(), people will write
replacements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389481 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 24 Sep 2012 12:42:32 +0000 (12:42 +0000)]
add pre_htaccess hook; in conjunction with earlier dirwalk_stat
and post_perdir_config hooks, this should allow mpm-itk to be
used without patches to httpd core
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389339 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 24 Sep 2012 11:58:52 +0000 (11:58 +0000)]
WinNT MPM logging:
clarify when it is the child process event handle being logged
log the child process id in a few obvious places
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389316 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 24 Sep 2012 11:53:31 +0000 (11:53 +0000)]
Fixing some typos...again - there must be gnomes hiding in the machinery, somewhere.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389313 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 24 Sep 2012 10:41:07 +0000 (10:41 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389281 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 24 Sep 2012 10:33:34 +0000 (10:33 +0000)]
Fixing a Spanish typo (as per comment #308 on site)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389278 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 24 Sep 2012 10:32:50 +0000 (10:32 +0000)]
whitespace fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389277 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sun, 23 Sep 2012 14:11:02 +0000 (14:11 +0000)]
consolidate hints/instructions about using APR (and maybe APR-util) with httpd
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1389060 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Sat, 22 Sep 2012 21:14:00 +0000 (21:14 +0000)]
Windows build for mod_cache_socache added in r1388660
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388899 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Sat, 22 Sep 2012 16:11:02 +0000 (16:11 +0000)]
Keep this in, but commented out: also provide a little
more background/rationale. This, hopefully, satisfies both
ends of the debate: we don't "assume" that everyone who
uses this browser didn't make the specific choice, but
we allow for admins who care about DNT and want to either
1. Make a statement
2. Force adherence to the standard
to easily do so.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388825 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Sep 2012 15:32:25 +0000 (15:32 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388819 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2012 20:10:16 +0000 (20:10 +0000)]
mod_cache_socache: New cache implementation backed by mod_socache
that replaces mod_mem_cache removed from httpd v2.2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388660 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2012 19:56:02 +0000 (19:56 +0000)]
Rebuild docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388653 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2012 19:46:23 +0000 (19:46 +0000)]
mod_auth_form: Support the expr parser in the
AuthFormLoginRequiredLocation, AuthFormLoginSuccessLocation and
AuthFormLogoutLocation directives.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388648 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 21 Sep 2012 18:27:50 +0000 (18:27 +0000)]
force these
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388603 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 21 Sep 2012 11:59:06 +0000 (11:59 +0000)]
add dirwalk_stat hook, for use by mpm-itk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388447 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 21 Sep 2012 11:53:22 +0000 (11:53 +0000)]
axe unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388445 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 21 Sep 2012 11:53:01 +0000 (11:53 +0000)]
fix BalancerInherit command processing from r1388029
(still not tested)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388444 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 20 Sep 2012 20:14:01 +0000 (20:14 +0000)]
whitespace fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388191 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 20 Sep 2012 14:51:51 +0000 (14:51 +0000)]
Make printenv.vbs inactive by default.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388054 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 20 Sep 2012 13:47:55 +0000 (13:47 +0000)]
xforms for BalancerInherit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388031 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 20 Sep 2012 13:41:45 +0000 (13:41 +0000)]
OK, enable/allow previous broken, bad behavior iff the user
really, really wants it. And warn that b-m isn't recommended
in those cases.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1388029 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 20 Sep 2012 11:48:30 +0000 (11:48 +0000)]
Install the new printenv.vbs file in cgi-bin on Windows
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387984 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 20 Sep 2012 11:26:34 +0000 (11:26 +0000)]
fix clang warning (dead initialization)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387979 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2012 17:46:32 +0000 (17:46 +0000)]
and this one as well... persist isn't inherited
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387693 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2012 17:42:38 +0000 (17:42 +0000)]
Oops... didn't mean to commit that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387691 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2012 17:21:55 +0000 (17:21 +0000)]
Re-instate balancer merge (for the time being) but force
persistence if the top-level server has it defined....
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387684 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 19 Sep 2012 16:10:12 +0000 (16:10 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387658 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 19 Sep 2012 16:07:09 +0000 (16:07 +0000)]
s/2.3/2.5/ and s/2.5/2.&httpd.minor;/ where applicable (assuming it works)
also note that a specific issue with mod_authn_dbd also applies to 2.4, so as to not confuse readers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387657 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 19 Sep 2012 15:09:35 +0000 (15:09 +0000)]
* server/mpm/prefork/prefork.c (child_main): Don't log errors for an
apr_pollset_add() failure if a graceful-stop has been signalled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387633 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 19 Sep 2012 14:29:39 +0000 (14:29 +0000)]
This is httpd 2.5, not 2.3, and we do not support Windows 9x/ME anymore, so let's just drop the reference to them.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387612 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 19 Sep 2012 14:26:17 +0000 (14:26 +0000)]
switch back to MOD_SSL_LDADD, as suggested by jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387610 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2012 14:18:19 +0000 (14:18 +0000)]
Log whether or not the restore from shm actually
resulted in a match of shm data, or whether it
was stale.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387607 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2012 14:17:03 +0000 (14:17 +0000)]
wtf are we doing merging in these from the parent??
These are server specific!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387603 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 19 Sep 2012 07:44:53 +0000 (07:44 +0000)]
* APR-UTIL trunk is dead. Point to the latest stable branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387473 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2012 03:51:25 +0000 (03:51 +0000)]
Use identifying server_rec info when we know we have
unique and useful data :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387444 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Wed, 19 Sep 2012 03:04:53 +0000 (03:04 +0000)]
Added VBScript CGI sample for Windows.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387439 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 18 Sep 2012 22:03:11 +0000 (22:03 +0000)]
Whoups?!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387389 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Sep 2012 18:11:13 +0000 (18:11 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387294 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Sep 2012 18:03:53 +0000 (18:03 +0000)]
no longer valid since r1387287
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387290 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Sep 2012 18:02:31 +0000 (18:02 +0000)]
By using a consistent naming structure, we can persist
across stop/starts (assuming people don't change
such basics as scheme, hostname, etc...)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387287 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Sep 2012 12:15:50 +0000 (12:15 +0000)]
Persist local balancer-manager changes across restart/graceful.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387110 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Sep 2012 12:13:28 +0000 (12:13 +0000)]
Document new provider function fgrab()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387108 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Sep 2012 10:59:20 +0000 (10:59 +0000)]
Add in new type CLEARINUSE which allows the inuse table to
be cleared upon storage. This may be expected/wanted/required
by some applications
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387088 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 18 Sep 2012 10:42:54 +0000 (10:42 +0000)]
Use our private function and just allow for conditonal
concat of .persist suffix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1387085 13f79535 -47bb-0310-9956-
ffa450edef68