Home Explore Help
Sign In
RONCC
/
Big-Data-HPC-Platform
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

HPCC-9487 ESP should set IE=edge for certain ECLIDE HTTP responses

For certain content, ECLIDE need ESP to set the HTTP header
X-UA-Compatible to "IE=edge" and add <!DOCTYPE html> to the content.

This triggers the IE activex plugin to render in the proper content
mode.

Signed-off-by: Anthony Fishbeck <Anthony.Fishbeck@lexisnexis.com>
Anthony Fishbeck 12 years ago
parent
3121598d2b
commit
9b50adcf43
3 changed files with 26 additions and 0 deletions
Split View Show Diff Stats
  1. 4 0
      esp/bindings/http/platform/httpbinding.cpp
  2. 19 0
      esp/bindings/http/platform/httpbinding.hpp
  3. 3 0
      esp/bindings/http/platform/httpservice.cpp

+ 4 - 0
esp/bindings/http/platform/httpbinding.cpp
View File 

@@ -672,6 +672,7 @@ int EspHttpBinding::onGet(CHttpRequest* request, CHttpResponse* response)
 
         case sub_serv_index:
 
             return onGetIndex(context, request, response, serviceName.str());
 
         case sub_serv_files:
 
+            checkInitEclIdeResponse(request, response);
 
             return onGetFile(context, request, response, pathEx.str());
 
         case sub_serv_itext:
 
             return onGetItext(context, request, response, pathEx.str());
 
@@ -1050,11 +1051,13 @@ int EspHttpBinding::onGetFile(IEspContext &context, CHttpRequest* request, CHttp
 
 {
 
     return onGetNotFound(context, request,  response, NULL);
 
 }
 
+
 
 int EspHttpBinding::onGetItext(IEspContext &context, CHttpRequest* request, CHttpResponse* response, const char *path)
 
 {
 
     StringBuffer title;
 
     request->getParameter("text", title);
 
     StringBuffer content;
 
+    checkInitEclIdeResponse(request, response, &content);
 
     content.append("<html><head>");
 
     if(title.length() > 0)
 
         content.appendf("<title>%s</title>", title.str());
 
@@ -1071,6 +1074,7 @@ int EspHttpBinding::onGetIframe(IEspContext &context, CHttpRequest* request, CHt
 
     StringBuffer title;
 
     request->getParameter("esp_iframe_title", title);
 
     StringBuffer content;
 
+    checkInitEclIdeResponse(request, response, &content);
 
     content.append("<html><head>");
 
     if(title.length() > 0)
 
         content.appendf("<title>%s</title>", title.str());

+ 19 - 0
esp/bindings/http/platform/httpbinding.hpp
View File 

@@ -300,4 +300,23 @@ protected:
 
     const char* queryAuthMethod() {return m_authmethod.str(); }
 
 };
 
 
+inline bool isEclIdeRequest(CHttpRequest *request)
 
+{
 
+    StringBuffer userAgent;
 
+    return strstr(request->getHeader("User-Agent", userAgent), "eclide/") != NULL;
 
+}
 
+
 
+inline void initEclIdeResponse(CHttpResponse* response, StringBuffer *content = NULL)
 
+{
 
+    response->addHeader("X-UA-Compatible", "IE=edge");
 
+    if (content)
 
+        content->append("<!DOCTYPE html>"); //may be safe for all browsers? but better to be safe for now?
 
+}
 
+
 
+inline void checkInitEclIdeResponse(CHttpRequest *request, CHttpResponse* response, StringBuffer *content = NULL)
 
+{
 
+    if (isEclIdeRequest(request))
 
+        initEclIdeResponse(response, content);
 
+}
 
+
 
 #endif //_SOAPBIND_HPP__

+ 3 - 0
esp/bindings/http/platform/httpservice.cpp
View File 

@@ -345,7 +345,10 @@ int CEspHttpServer::processRequest()
 
                 if (methodName.charAt(methodName.length()-1)=='_')
 
                     methodName.setCharAt(methodName.length()-1, 0);
 
                 if (!stricmp(methodName.str(), "files"))
 
+                {
 
+                    checkInitEclIdeResponse(m_request, m_response);
 
                     return onGetFile(m_request.get(), m_response.get(), pathEx.str());
 
+                }
 
                 else if (!stricmp(methodName.str(), "xslt"))
 
                     return onGetXslt(m_request.get(), m_response.get(), pathEx.str());
 
                 else if (!stricmp(methodName.str(), "body"))