Merge branch 'ST2_0508_httpHeader' into feature_fingerPrint_js

Module/mod_chromium/CModTools.cpp

@@ -652,6 +652,7 @@ namespace Chromium {
 					dstUrl = "\"file:///" + redirctUrlRet.second + "?redirect_open=" + url + "&redirect_type=" + name + "\"";
 				}
 			}
+
 			strParams.Append(" --allow-running-insecure-content --disable-infobars --disable-suggestions-service --disable-save-password-bubble --disable-component-update");
 			
 			
@@ -668,6 +669,10 @@ namespace Chromium {
 			CSimpleStringA usrDataPath(tempPath);
 			usrDataPath.Append(SPLIT_SLASH_STR).Append("UOSBrowserConfig_").Append(name.c_str());
 			strParams.Append(" --user-data-dir=").Append(usrDataPath);
+
+			CSimpleStringA debug_log_path = usrDataPath + "/chrome_debug.log";
+			if (ConfigManager::getInstance().m_withDebugMode)
+				strParams.Append(" --enable-logging --vmodule=*/webrtc/*=2,*/media/*=2 --log-file=").Append(debug_log_path);
 			strParams.Append(" --app=").Append(dstUrl.c_str());
 			strUOSBrowserPath.Append(strParams);
 			return strUOSBrowserPath.GetData();
@@ -687,6 +692,8 @@ namespace Chromium {
 					dstUrl = "\"file:///" + redirctUrlRet.second + "?redirect_open=" + url + "&redirect_type=" + name + "\"";
 				}
 			}
+
+
 			CSimpleStringA tempPath;
 			this->m_pEntity->GetFunction()->GetPath("Temp", tempPath);
 			CSimpleStringA cachePath(tempPath);
@@ -699,6 +706,9 @@ namespace Chromium {
 			CSimpleStringA usrDataPath(tempPath);
 			usrDataPath.Append(SPLIT_SLASH_STR).Append("BrowserConfig_").Append(name.c_str());
 			strParams.Append(" --user-data-dir=").Append(usrDataPath);
+			CSimpleStringA debug_log_path = usrDataPath + "/chrome_debug.log";
+			if (ConfigManager::getInstance().m_withDebugMode)
+				strParams.Append(" --enable-logging --vmodule=*/webrtc/*=2,*/media/*=2 --log-file=").Append(debug_log_path);
 			strParams.Append(" --app=").Append(dstUrl.c_str());
 			strUOSBrowserPath.Append(strParams);
 			return strUOSBrowserPath.GetData();
@@ -836,6 +846,8 @@ namespace Chromium {
 					dstUrl = "\"file:///" + redirctUrlRet.second + "?redirect_open=" + url + "&redirect_type=" + name + "\"";
 				}
 			}
+
+
 			if (pageType == 0 || pageType == 2 || pageType == 3) {
 
 			} else if (pageType == 1) {
@@ -879,6 +891,10 @@ namespace Chromium {
                 usrDataPath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("UOSBrowserConfigMain_").Append((+ERR_PAGE_REASON::OutsideRequest)._to_string());
             }
             strParams.Append(" --user-data-dir=").Append(usrDataPath);
+
+			CSimpleStringA debug_log_path = usrDataPath + "/chrome_debug.log";
+			if (ConfigManager::getInstance().m_withDebugMode)
+				strParams.Append(" --enable-logging --vmodule=*/webrtc/*=2,*/media/*=2 --log-file=").Append(debug_log_path);
             strParams.Append(" ");
             strParams.Append(dstUrl.c_str());
             strUOSBrowserPath.Append(strParams);
@@ -907,6 +923,7 @@ namespace Chromium {
 					dstUrl = "\"file:///" + redirctUrlRet.second + "?redirect_open=" + url + "&redirect_type=" + name + "\"";
 				}
 			}
+
             if (pageType == 0 || pageType == 2 || pageType == 3) {
 
             } else if (pageType == 1) {
@@ -950,6 +967,9 @@ namespace Chromium {
                 cachePath.Append(CSimpleStringA(SPLIT_SLASH_STR)).Append("BrowserConfigMain_").Append((+ERR_PAGE_REASON::OutsideRequest)._to_string());
             }
             strParams.Append(" --user-data-dir=").Append(usrDataPath);
+			CSimpleStringA debug_log_path = usrDataPath + "/chrome_debug.log";
+			if (ConfigManager::getInstance().m_withDebugMode)
+				strParams.Append(" --enable-logging --vmodule=*/webrtc/*=2,*/media/*=2 --log-file=").Append(debug_log_path);
             strParams.Append(" ");
             strParams.Append(dstUrl.c_str());
             strUOSBrowserPath.Append(strParams);