www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
22,315 Commits 62 Branches 313 Tags
input-filter-dev
Commit Graph

81 Commits

Author SHA1 Message Date
Stefan Fritsch
bd5efb04fa We still have to pass the dependency check to APACHE_MODULE to ensure 
that mod_session_crypto is disabled with --enable-mods-shared=reallyall


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1199046 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-08 01:34:58 +00:00
Jeff Trawick
3097e8585d if mod_session_crypto prereq isn't available, don't bail if 
the module was enabled implicitly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1198989 13f79535-47bb-0310-9956-ffa450edef68
 2011-11-07 22:59:51 +00:00
Guenter Knauf
aeedd021c7 Fixed NetWare build check for APU_HAVE_CRYPTO. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194935 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-29 17:12:32 +00:00
Guenter Knauf
aae60cdbd8 Added check for APU_HAVE_CRYPTO to NetWare build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194930 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-29 16:42:22 +00:00
Guenter Knauf
2b26aee8d1 Some NetWare build tweaks: removed obsolete include paths. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1194893 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-29 14:27:14 +00:00
Graham Leggett
1211292e7f Remove spurious parsing of the cipher parameter. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1188945 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-25 22:10:04 +00:00
Graham Leggett
848139b502 mod_session_crypto: Refactor to support the new apr_crypto API. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1188900 13f79535-47bb-0310-9956-ffa450edef68
 2011-10-25 20:45:40 +00:00
Jim Jagielski
103f776c25 Cleanup effort in prep for GA push: 
Trim trailing whitespace... no func change



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174748 13f79535-47bb-0310-9956-ffa450edef68
 2011-09-23 13:38:09 +00:00
Stefan Fritsch
891953516f 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
 2011-07-24 18:57:17 +00:00
Stefan Fritsch
abb02e83c2 Fix build with recent apr_crypto API change 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138611 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-22 20:16:43 +00:00
Stefan Fritsch
59c52538f3 Code cleanup: replace apr_table_set with non-copying apr_table_setn 
in a few places

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137413 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-19 18:50:12 +00:00
Graham Leggett
cc6b937c77 mod_session_crypto: Use the apr v2.0 crypto interface, which has been 
backported to apr-util v1.4.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1126233 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-22 21:37:21 +00:00
Graham Leggett
b9474fdfeb Remove the references to apr_crypto_t where apr_crypto_block_t is already 
present.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103385 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-15 14:15:22 +00:00
Graham Leggett
e18345a584 Add API protection against the deprecated v1.4 apr_crypto API. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103351 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-15 12:44:25 +00:00
Graham Leggett
e155f87c68 Reorder the parameters as per the updated apr v2.0 apr_crypto API. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103337 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-15 12:24:22 +00:00
Graham Leggett
2a1e8f277b Use namespace protection on mode and type constants. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103331 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-15 11:39:00 +00:00
Guenter Knauf
888ec80125 Use a var INSTALLBASE to simplify NetWare installation rules. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082821 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-18 04:56:06 +00:00
Guenter Knauf
bab978c56e Use var for prelude so its possible to change it at one place. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1082811 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-18 03:09:27 +00:00
Guenter Knauf
e8a8becc0f NetWare build overhaul in order to compile on Linux. 
Removed absolute paths to imp files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079487 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-08 18:59:02 +00:00
Guenter Knauf
46b7e1d210 NetWare build overhaul in order to compile on Linux. 
Take 1.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1079407 13f79535-47bb-0310-9956-ffa450edef68
 2011-03-08 16:04:40 +00:00
Stefan Fritsch
e74c4e4cdc Actually check for APU_HAVE_CRYPTO at configure time. This fixes a compile 
error with apr 2 if crypto is disabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1072155 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-18 21:27:12 +00:00
Stefan Fritsch
385da96d50 Use ap_state_query() to fix many modules that were not correctly initializing 
if they were not active during server startup but got enabled later during a
graceful restart (in which case they need to do all work during a single
config run).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070153 13f79535-47bb-0310-9956-ffa450edef68
 2011-02-12 21:23:56 +00:00
Stefan Fritsch
1882214e86 break some very long lines, no code change 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1063016 13f79535-47bb-0310-9956-ffa450edef68
 2011-01-24 22:12:24 +00:00
Guenter Knauf
2db74403c1 Fixed compile-time error message. 
We test for APU, thus the error statement should tell same;
APR and APU are independent before APR 2.0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1037941 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-22 23:34:24 +00:00
Jim Jagielski
e0d16cce4d Note for future dev.... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1030496 13f79535-47bb-0310-9956-ffa450edef68
 2010-11-03 15:21:50 +00:00
Guenter Knauf
5e8988e256 Removed obsolete include paths from NetWare makefiles. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966904 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-22 23:38:58 +00:00
Paul Querna
ad53d4dcbd CVE-2010-1452: Fix handling of missing path segments in the parsed URI structure. 
If a specially crafted request was sent, it is possible to crash mod_dav, 
mod_cache or mod_session, as they accessed a field that is set to NULL
by the URI parser, assuming that it always put in a valid string.

PR: 49246
Submitted by: Mark Drayton
Patch by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@966348 13f79535-47bb-0310-9956-ffa450edef68
 2010-07-21 18:25:01 +00:00
Brian Havard
8a47421de6 OS/2: Fix building of more modules that depend on symbols from other modules. 
Affected modules are: mod_heartbeat, mod_session_cookie, mod_session_crypto,
mod_session_dbd and mod_disk_cache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@956857 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-22 11:57:51 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take 
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:59:50 +00:00
Rainer Jung
afd39cbd25 Work around crypto API incompatibilities. 
The API in APR 2 is different from the API in APU 1.4/1.5.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951870 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 14:47:11 +00:00
Rainer Jung
f254979311 Fix broken mod_session_crypto build. 
Using -I$APR_INCLUDEDIR and -I$APU_INCLUDEDIR breaks
for APR 2, because $APU_INCLUDEDIR is empty and a
lonely "-I" doesn't do good for the compiler.

It also breaks for VPATH builds, because then
$APR_INCLUDEDIR contains two paths.

Using $APR_INCLUDES $APU_INCLUDES fixes both problems
and seems to be the way it is done for other modules.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951766 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-05 20:58:43 +00:00
Graham Leggett
e3aec99437 Make sure we respect the proper pool lifetimes when saving away a preparsed 
session.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@928238 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-27 17:48:20 +00:00
Jeff Trawick
e6fc6d32b6 use separate #error message when APR[-Util] is of a valid 
version but wasn't built with crypto support


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@918562 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-03 16:44:57 +00:00
Graham Leggett
c48364cabc mod_session: Session expiry was being initialised, but not updated 
on each session save, resulting in timed out sessions when there
should not have been. Fixed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@905490 13f79535-47bb-0310-9956-ffa450edef68
 2010-02-02 01:18:36 +00:00
Graham Leggett
e76a453763 Correctly reference the apr_crypto_t context as a context and not a factory, 
using the new name apr_crypto_make.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@890581 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-15 00:31:39 +00:00
Jim Jagielski
83532ab628 Enhance ap_hook_monitor to pass along a server_rec (in 
general the ap_server_conf) and tuck away some storage
in there which may be useful as an opaque data pointer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@818825 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-25 11:59:30 +00:00
Graham Leggett
9c0867de9d mod_session_crypto: Sanity check should the potentially encrypted 
session cookie be too short.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@814334 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-13 16:04:13 +00:00
Graham Leggett
b890238ef4 mod_session.c: Prevent a segfault when session is added but not 
configured.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@814327 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-13 14:59:28 +00:00
Graham Leggett
2a63c6013f Remove stray trailing whitespace from mod_session.c. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@814325 13f79535-47bb-0310-9956-ffa450edef68
 2009-09-13 14:56:07 +00:00
William A. Rowe Jr
5181635ab3 Always make mod_*.h files available where they exist, modpath by modpath 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808722 13f79535-47bb-0310-9956-ffa450edef68
 2009-08-28 01:27:46 +00:00
Graham Leggett
168b109007 mod_session_crypto: Ensure that SessionCryptoDriver can only be 
set in the global scope.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731377 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-04 22:29:05 +00:00
Graham Leggett
7b58a40668 mod_session_crypto: Rewrite the session_crypto module against the 
apr_crypto API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731088 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-03 21:09:47 +00:00
Rainer Jung
a64dd8d898 Allow feature test for apr_ssl.h to succeed: 
Add necessary search paths temporarily to CPPFLAGS.

Addition to r730717.

When switching to another header, no need to again
rename the ap_HAVE_APR_CRYPTO variable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@731009 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-03 16:12:55 +00:00
Rainer Jung
59b02aa75b Prevent empty test statement. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730800 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-02 17:40:55 +00:00
Rainer Jung
5ac1a1ec0f Add a header check for apr_ssl.h to mod_session_crypto. 
The modules needs the header which is at the moment
only part of the ssl-evp branch of APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730717 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-02 13:54:54 +00:00
Bradley Nicholes
3a3dd65e29 Remove the ap_session_get, ap_session_set export references for the NetWare build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@710140 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-03 19:36:47 +00:00
Graham Leggett
4ed2378c5e mod_session_cookie, mod_session_dbd: Make sure cookies are set both 
within the output headers and error output headers, so that the
session is maintained across redirects.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@690501 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-30 13:37:52 +00:00
Graham Leggett
0ec83e8b1b mod_session_cookie: Make sure that cookie attributes are correctly 
included in the blank cookie when cookies are removed. This fixes an
inability to log out when using mod_auth_form.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@690400 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-29 21:49:27 +00:00
Ruediger Pluem
dd3067baac * Prevent a segfault when a CGI script sets a cookie with a null value. 
Submitted by: David Shane Holden <dpejesh apache.org>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@678160 13f79535-47bb-0310-9956-ffa450edef68
 2008-07-19 14:00:23 +00:00
William A. Rowe Jr
1ed653d36a Catch up with a host of changes to the current module set 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664240 13f79535-47bb-0310-9956-ffa450edef68
 2008-06-07 02:10:32 +00:00