www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
24,047 Commits 62 Branches 306 Tags
d0adb613ecd02ed7206815ce9c67d8de8482da05
Commit Graph

24047 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Gruno
d0adb613ec "AllowOverride Indexes" also controls FallbackResource availability in .htaccess, so let's write that. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395610 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-08 15:19:23 +00:00
Rich Bowen
659c78c604 Rebuild HTML and translations 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395560 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-08 13:39:27 +00:00
Rich Bowen
71bbbb6469 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
 2012-10-08 13:35:52 +00:00
Rich Bowen
2a1859cfae 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
 2012-10-07 22:59:14 +00:00
Stefan Fritsch
566312f891 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
 2012-10-07 09:10:14 +00:00
Stefan Fritsch
c2eb43db55 add support for bcrypt 
PR: 49288


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395255 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-07 09:06:10 +00:00
Stefan Fritsch
65d07ff463 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
 2012-10-07 09:03:51 +00:00
Stefan Fritsch
7d8882b4b4 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
 2012-10-07 09:02:19 +00:00
Stefan Fritsch
67fde08ec7 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
 2012-10-07 08:56:45 +00:00
Kaspar Brand
c2b7802e78 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
 2012-10-07 06:26:53 +00:00
Daniel Gruno
64cd96f23d xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395193 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-07 00:07:05 +00:00
Lucien Gentis
4d3a6a2502 Updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1395079 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-06 14:57:27 +00:00
Daniel Gruno
78754865e2 xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1394986 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-06 10:36:55 +00:00
Daniel Gruno
ec5b986f6e 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
 2012-10-06 10:35:25 +00:00
Daniel Gruno
221ebf873d xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1394838 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-05 22:05:01 +00:00
Daniel Gruno
054159027a 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
 2012-10-05 22:03:57 +00:00
Daniel Gruno
281cef9ff3 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
 2012-10-04 20:42:25 +00:00
Jim Jagielski
250323fb2c update xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1394080 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-04 13:59:28 +00:00
Jim Jagielski
46ccd26e33 update doccos 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1394079 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-04 13:57:17 +00:00
Joe Orton
ca9bd8eb67 * 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
 2012-10-04 11:44:34 +00:00
Joe Orton
7414006ae9 * 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
 2012-10-04 10:12:41 +00:00
André Malo
c6ebb22114 property fix. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1393688 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-03 19:10:02 +00:00
André Malo
871fe17bb2 update transformation 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1393682 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-03 19:04:23 +00:00
Graham Leggett
05a6240adc Fix spelling mistakes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1393564 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-03 15:49:17 +00:00
Daniel Gruno
80604ab2e6 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
 2012-10-03 09:53:42 +00:00
Joe Orton
44cb002091 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
 2012-10-03 08:20:50 +00:00
Graham Leggett
3fcc044205 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
 2012-10-02 20:10:21 +00:00
Graham Leggett
dcdc124c70 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
 2012-10-02 17:41:00 +00:00
Graham Leggett
53dfcf75e5 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
 2012-10-02 17:02:44 +00:00
Daniel Gruno
5c75fe99e1 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
 2012-10-02 15:34:23 +00:00
Jeff Trawick
f5584db9a3 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
 2012-10-02 11:33:34 +00:00
Jeff Trawick
9840fde938 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
 2012-10-01 14:20:37 +00:00
Jim Jagielski
1c493b3ca5 and allow the xml param 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1392346 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-01 14:14:56 +00:00
Jim Jagielski
aaaca4d1db 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
 2012-10-01 14:14:53 +00:00
Guenter Knauf
6ae33e7334 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
 2012-10-01 05:36:39 +00:00
Jeff Trawick
82af8fdc8d --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
 2012-10-01 00:46:15 +00:00
Jeff Trawick
cfb26e446e 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
 2012-09-30 22:43:29 +00:00
Jeff Trawick
db3b8aa492 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
 2012-09-30 21:55:13 +00:00
Lucien Gentis
0e682d6784 Update. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1391815 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 14:40:52 +00:00
Lucien Gentis
cdaa83e337 Updates. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1391801 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 13:59:45 +00:00
Guenter Knauf
3caba8743a 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
 2012-09-29 08:44:53 +00:00
Guenter Knauf
d5a3cb2872 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
 2012-09-29 08:29:20 +00:00
Guenter Knauf
1dab1d092d Fixed comment. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1391771 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-29 08:25:21 +00:00
Graham Leggett
dd0f4c27ff 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
 2012-09-28 11:40:26 +00:00
Graham Leggett
c764558c0d 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
 2012-09-28 11:10:06 +00:00
Graham Leggett
22c2623820 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
 2012-09-28 11:05:55 +00:00
Jim Jagielski
ade3b53bb5 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
 2012-09-26 15:28:27 +00:00
Jim Jagielski
b633191c6d 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
 2012-09-26 15:24:23 +00:00
Jim Jagielski
92f1d1458f xforms 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389580 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-24 21:02:40 +00:00
Jim Jagielski
250b628a9d mod_header changes 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1389575 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-24 21:01:01 +00:00