sakaiproject/nakamura — pull request #391 by lancespeelmon (2011-11-08 23:42:11+00:00)
Title: Kern 2270 squash

I have verified this working against a local machine (i.e 8080/8082) and a machine behind an apache reverse http proxy (i.e. 443/8443). The config is much simpler now. Thanks, L

commit 42edf9adf7c155a99484e2b914c44cc14ea2c835
Author: Lance Speelmon
Date: Thu Nov 3 09:35:16 2011 -0700

KERN-2270 OsgiUtils -> PropertyUtils

commit 4ce2e489aa796d45a25b030bac47f21405e3fb19
Author: Ian Boston
Date: Thu Nov 3 10:23:22 2011 +1100

Fixed unit test,
With the previous change, if runnign http and https on the same host at the same time, all redirects must go to the https host.(cherry picked from commit 041cda59bdfec96a52611cb7b82fea1d527925cf)

Signed-off-by: Lance Speelmon

commit 6a10fe739823c2de14f88f5d99c2cc53fb67e3a2
Author: Ian Boston
Date: Thu Nov 3 09:44:51 2011 +1100

Allow protection on default ports whem the browser is passing headers with no port.(cherry picked from commit f27139f21b0550b416293bde8656b2b1a63d8107)

Signed-off-by: Lance Speelmon

commit 848f4bbf00ae5e515f1279c55f8ed0323d2f69e4
Author: Lance Speelmon
Date: Tue Nov 1 14:48:15 2011 -0700

KERN-2270 added sanity check for trusted hosted suggested by Ray Davis

commit 11cafa1058b8b366b6e107dae4c0773a478b65f2
Author: Lance Speelmon
Date: Tue Nov 1 09:56:47 2011 -0700

KERN-2270 updated debug statement for SafeHostFilter

commit d11c4254e4512987737736f3bef7145a73c6b1b3
Author: Lance Speelmon
Date: Tue Nov 1 09:43:49 2011 -0700

KERN-2270 removed foo file - sorry

commit 95c843cfa85d0baed27fdc0b90933757a562c3fc
Author: Lance Speelmon
Date: Tue Oct 11 20:55:57 2011 -0700

KERN-2270 Fixed compile time error

commit 8bb841993828acbd27ee5e28584579def1f75f27
Author: Lance Speelmon
Date: Tue Oct 11 20:18:31 2011 -0700

KERN-2270 Manual patch to match state of file @ c2e09ebdfb67099e11919e5567e6f6c9c5cbb0b1

commit a0b3a283ffb8480319b4b63eeaf0e0e86d16d2b1
Author: Lance Speelmon
Date: Tue Oct 11 20:02:32 2011 -0700

KERN-2270 Manual patch to match state of file @ c2e09ebdfb67099e11919e5567e6f6c9c5cbb0b1

commit 26537c803500de56493b49ad9d537b3f03f00902
Author: Ian Boston
Date: Tue Oct 11 14:12:37 2011 +1100

KERN-2270 Merge in ieb's enhancements to ServerProtectionService

Rationalised the Server Protection Service to make it easier to configure.(cherry picked from commit c2e09ebdfb67099e11919e5567e6f6c9c5cbb0b1)

Conflicts:

bundles/http/src/main/java/org/sakaiproject/nakamura/http/usercontent/ServerProtectionServiceImpl.java