From 2b837827ae231df14493c10ec11b9e012e9bef3c Mon Sep 17 00:00:00 2001
From: Shiv Kumar <shiv@newrelic.com>
Date: Sun, 26 Jan 2014 14:48:12 -0800
Subject: [PATCH 1/2] make search on 404 page secure

---
 app/views/exceptions/not_found.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/exceptions/not_found.html.erb b/app/views/exceptions/not_found.html.erb
index 478400dc3a..4938b5a093 100644
--- a/app/views/exceptions/not_found.html.erb
+++ b/app/views/exceptions/not_found.html.erb
@@ -25,7 +25,7 @@
   <div class="span10" style='padding-top: 20px'>
     <h2><%= t 'page_not_found.search_title' %></h2>
     <p>
-      <form action='http://google.com' id='google-search' onsubmit="return google_button_clicked()">
+      <form action='https://google.com' id='google-search' onsubmit="return google_button_clicked()">
         <input type="text" id='user-query' value="<%= @slug %>">
         <input type='hidden' id='google-query' name="q">
         <button class="btn btn-primary"><%= t 'page_not_found.search_google' %></button>

From 8cf467042e1cf22587dfc43cfaf433c293a20fbc Mon Sep 17 00:00:00 2001
From: Shiv Kumar <shivpkumar@gmail.com>
Date: Sun, 26 Jan 2014 15:24:38 -0800
Subject: [PATCH 2/2] make google search url protocol independent

---
 app/views/exceptions/not_found.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/exceptions/not_found.html.erb b/app/views/exceptions/not_found.html.erb
index 4938b5a093..da211f249a 100644
--- a/app/views/exceptions/not_found.html.erb
+++ b/app/views/exceptions/not_found.html.erb
@@ -25,7 +25,7 @@
   <div class="span10" style='padding-top: 20px'>
     <h2><%= t 'page_not_found.search_title' %></h2>
     <p>
-      <form action='https://google.com' id='google-search' onsubmit="return google_button_clicked()">
+      <form action='//google.com' id='google-search' onsubmit="return google_button_clicked()">
         <input type="text" id='user-query' value="<%= @slug %>">
         <input type='hidden' id='google-query' name="q">
         <button class="btn btn-primary"><%= t 'page_not_found.search_google' %></button>
@@ -40,4 +40,4 @@
     document.getElementById('google-query').value = 'site:<%= local_domain %> ' + searchValue;
     return true;
   }
-</script>
\ No newline at end of file
+</script>