Commits · 60b4dc951745bfc8d009960243813fa8cb32de6d · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

23 Aug, 2004 4 commits

Backport from HEAD: add "SSLUserName" directive to set r->user based · 60b4dc95

Joe Orton authored Aug 23, 2004

on a chosen SSL environment variable name.

* modules/ssl/mod_ssl.h (struct SSLDirConfigRec): Add
szUserName field.

* modules/ssl/ssl_engine_config.c (ssl_config_perdir_create,
ssl_config_perdir_merge): Initialize and merge szUserName field.
(ssl_cmd_SSLUserName): New function.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Fixup): Set r->user to
the value of the chosen SSL environment variable.

* modules/ssl/mod_ssl.c: Add SSLUserName config directive.

PR: 20957
Submitted by: Martin v. Loewis
Reviewed by: trawick, jorton, nd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104770 13f79535-47bb-0310-9956-ffa450edef68

60b4dc95

Backport from HEAD: · a97be514

Joe Orton authored Aug 23, 2004

* support/apachectl.in: Fix a problem finding envvars if sbindir !=
bindir.

* support/suexec.c: Pass the SERVER_SIGNATURE envvar through to CGIs.

PR: 30723
Submitted by: Friedrich Haubensak, Zvi Har'El
Reviewed by: trawick, jorton, nd, slive


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104769 13f79535-47bb-0310-9956-ffa450edef68

a97be514

Backport from HEAD: · a189e7ee

Joe Orton authored Aug 23, 2004

* acinclude.m4: Pick up OpenSSL libs/cflags from pkg-config.

* modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix potential
infinite loop in ssl_io_input_getline if connection is aborted without
inctx->rc being set.

* modules/ssl/ssl_scache_shmcb.c (ssl_scache_shmcb_init): Use an
anonymous shm segment by default or fall back on name-based shm.

PR: 18989, 21335, 29964
Submitted by: jerenkrantz, jorton
Reviewed by: jerenkrantz, trawick, jorton, nd, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104768 13f79535-47bb-0310-9956-ffa450edef68

a189e7ee

Backport from HEAD: · 375e3b19

Joe Orton authored Aug 23, 2004

* modules/mappers/mod_userdir.c (register_hooks): Move suexec_identity
hook to APR_HOOK_FIRST to ensure it runs before the mod_suexec hook.

PR: 18156
Submitted by: Joshua Slive
Reviewed by: jorton, slive, nd


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104767 13f79535-47bb-0310-9956-ffa450edef68

375e3b19

20 Aug, 2004 3 commits

Fix confused map cache (with maps in different VHs using · 1302b2ab

Andre Malo authored Aug 20, 2004

the same name).

PR: 26462
Reviewed by: Jeff Trawick, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104759 13f79535-47bb-0310-9956-ffa450edef68

1302b2ab

use more intuitive variable names · 9815e532

Stas Bekman authored Aug 20, 2004

ap_sub_req_*_uri  to use new_uri
ap_sub_req_*_file to use new_file
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104757 13f79535-47bb-0310-9956-ffa450edef68

9815e532

/(&$%(&/ && vote · 3b6de606

Andre Malo authored Aug 20, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104755 13f79535-47bb-0310-9956-ffa450edef68

3b6de606

19 Aug, 2004 5 commits

update transformation · 4b54f850

Andre Malo authored Aug 19, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104739 13f79535-47bb-0310-9956-ffa450edef68

4b54f850

remove "support" for Remote_User variable, which never worked at all. · 651263e2

Andre Malo authored Aug 19, 2004

PR: 25725
Reviewed by: Justin Erenkrantz, Paul Querna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104736 13f79535-47bb-0310-9956-ffa450edef68

651263e2

update transformation · f96ae82d

Andre Malo authored Aug 19, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104734 13f79535-47bb-0310-9956-ffa450edef68

f96ae82d

Fix regression from 1.3: · 00109158

Andre Malo authored Aug 19, 2004

There's a new optional flag for the Header directive
('always'), which keeps the former ErrorHeader functionality.

The opposite flag to 'always' is 'onsuccess'. So the new directives
are written as:

Header set foo bar
# which is the same as
Header onsuccess set foo bar
# and a subset of
Header always set foo bar
# which is what the ErrorHeader directive did.

PR: 28657
Obtained from: 2.1
Reviewed by: Brad Nicholes, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104732 13f79535-47bb-0310-9956-ffa450edef68

00109158

vote & note · 51cad98e

Andre Malo authored Aug 19, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104728 13f79535-47bb-0310-9956-ffa450edef68

51cad98e

18 Aug, 2004 6 commits

I don't have a system to test suexec, but · 4386570f

Joshua Slive authored Aug 18, 2004

I'll vote for a couple trivial suexec-related
fixes anyway.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104709 13f79535-47bb-0310-9956-ffa450edef68

4386570f

Propose+vote. · 3b4bcdd1

Joe Orton authored Aug 18, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104705 13f79535-47bb-0310-9956-ffa450edef68

3b4bcdd1

suexec backport · a8ae0107

Jeff Trawick authored Aug 18, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104704 13f79535-47bb-0310-9956-ffa450edef68

a8ae0107

merge a tiny build fix? · 3071d899

Jeff Trawick authored Aug 18, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104702 13f79535-47bb-0310-9956-ffa450edef68

3071d899

Backport of the 'httpready' Accept Filter changes from 2.1-dev · 9edbd378

Paul Querna authored Aug 18, 2004

Reviewed by: Justin Erenkrantz, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104698 13f79535-47bb-0310-9956-ffa450edef68

9edbd378

One more vote.. · 37c8dfe2

Paul Querna authored Aug 18, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104697 13f79535-47bb-0310-9956-ffa450edef68

37c8dfe2

17 Aug, 2004 2 commits

escape the cookie_name before pasting into the regexp. · ca06e80e

Andre Malo authored Aug 17, 2004

Reviewed by: Jeff Trawick, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104693 13f79535-47bb-0310-9956-ffa450edef68

ca06e80e

vote-and-run. · 4e2eb43e

Justin Erenkrantz authored Aug 17, 2004


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@104691 13f79535-47bb-0310-9956-ffa450edef68

4e2eb43e

15 Aug, 2004 12 commits

vote · 1b44c78a