[LON-CAPA-cvs] cvs: loncom /rewrites loncapa_rewrite_off.conf loncapa_rewrite_on.conf

[raeburn]

raeburn		Sat Dec 28 03:16:14 2013 EDT

  Modified files:              
    /loncom/rewrites	loncapa_rewrite_off.conf loncapa_rewrite_on.conf 
  Log:
  - Related to bug 6662.
    - Always serve syllabus from non-SSL (i.e., http). 
    - Syllabus can be set to point at an external URL, in which case the 
      external web page is loaded in an iframe. If the remote URL is 
      http://, the syllabus needs to be served from port 80, if the 
      LON-CAPA server hosting the session has Apache/SSL (otherwise Firefox
      will block loading of the content in the iframe, by default).
   -  In addition to committed changes in LON-CAPA modules, an appropriate
      RewriteRule is also needed for <VirtualHost _default_:443> (e.g.,
      in /etc/httpd/conf.d/ssl.conf on the LON-CAPA server. (see:
      http://bugs.loncapa.org/show_bug.cgi?id=6662).
  
  
Index: loncom/rewrites/loncapa_rewrite_off.conf
diff -u loncom/rewrites/loncapa_rewrite_off.conf:1.2 loncom/rewrites/loncapa_rewrite_off.conf:1.3
--- loncom/rewrites/loncapa_rewrite_off.conf:1.2	Sat Sep  7 19:58:04 2013
+++ loncom/rewrites/loncapa_rewrite_off.conf	Sat Dec 28 03:16:13 2013
@@ -7,6 +7,8 @@
     RewriteRule (.*) - [L]
     RewriteCond %{REQUEST_URI} ^/adm/annotations$
     RewriteRule (.*) - [L]
+    RewriteCond %{REQUEST_URI} ^/public/.*/syllabus$
+    RewriteRule (.*) - [L]
     RewriteCond %{HTTPS} !=on
     RewriteRule ^/(.*)$ https://%{HTTP_HOST}/$1 [R,L]
   </IfModule>
Index: loncom/rewrites/loncapa_rewrite_on.conf
diff -u loncom/rewrites/loncapa_rewrite_on.conf:1.2 loncom/rewrites/loncapa_rewrite_on.conf:1.3
--- loncom/rewrites/loncapa_rewrite_on.conf:1.2	Sat Sep  7 19:58:04 2013
+++ loncom/rewrites/loncapa_rewrite_on.conf	Sat Dec 28 03:16:13 2013
@@ -7,6 +7,8 @@
     RewriteRule (.*) - [L]
     RewriteCond %{REQUEST_URI} ^/adm/annotations$
     RewriteRule (.*) - [L]
+    RewriteCond %{REQUEST_URI} ^/public/.*/syllabus$
+    RewriteRule (.*) - [L]
     RewriteCond %{HTTPS} !=on
     RewriteRule ^/(.*)$ https://%{HTTP_HOST}/$1 [R,L]
   </IfModule>