Skip to content

Commit

Permalink
Modifying IE driver to no longer always send 'Connection: close' header
Browse files Browse the repository at this point in the history
  • Loading branch information
jimevans committed Dec 15, 2018
1 parent 57dc4e2 commit 1114ccd
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions cpp/iedriver/IEDriver.rc
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,141,0,2
PRODUCTVERSION 3,141,0,2
FILEVERSION 3,141,0,3
PRODUCTVERSION 3,141,0,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Software Freedom Conservancy"
VALUE "FileDescription", "Driver library for the IE driver"
VALUE "FileVersion", "3.141.0.2"
VALUE "FileVersion", "3.141.0.3"
VALUE "InternalName", "IEDriver.dll"
VALUE "LegalCopyright", "Copyright (C) 2018"
VALUE "OriginalFilename", "IEDriver.dll"
VALUE "ProductName", "Selenium WebDriver"
VALUE "ProductVersion", "3.141.0.2"
VALUE "ProductVersion", "3.141.0.3"
END
END
BLOCK "VarFileInfo"
Expand Down
5 changes: 5 additions & 0 deletions cpp/iedriverserver/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ available via the project downloads page. Changes in "revision" field indicate
private releases checked into the prebuilts directory of the source tree, but
not made generally available on the downloads page.

v3.141.0.3
==========
* Updated Civetweb dependency to version 1.11.
* Modified IE driver to no longer always sent Connection: close header.

v3.141.0.2
==========
* Updating IE scroll-into-view algorithm for element click.
Expand Down
8 changes: 4 additions & 4 deletions cpp/iedriverserver/IEDriverServer.rc
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,141,0,2
PRODUCTVERSION 3,141,0,2
FILEVERSION 3,141,0,3
PRODUCTVERSION 3,141,0,3
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Software Freedom Conservancy"
VALUE "FileDescription", "Command line server for the IE driver"
VALUE "FileVersion", "3.141.0.2"
VALUE "FileVersion", "3.141.0.3"
VALUE "InternalName", "IEDriverServer.exe"
VALUE "LegalCopyright", "Copyright (C) 2018"
VALUE "OriginalFilename", "IEDriverServer.exe"
VALUE "ProductName", "Selenium WebDriver"
VALUE "ProductVersion", "3.141.0.2"
VALUE "ProductVersion", "3.141.0.3"
END
END
BLOCK "VarFileInfo"
Expand Down
Binary file modified cpp/prebuilt/Win32/Release/IEDriverServer.exe
Binary file not shown.
Binary file modified cpp/prebuilt/x64/Release/IEDriverServer.exe
Binary file not shown.
15 changes: 5 additions & 10 deletions cpp/webdriver-server/server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,7 @@ void Server::SendHttpOk(struct mg_connection* connection,
<< "Content-Type: " << content_type << "; charset=UTF-8\r\n"
<< "Cache-Control: no-cache\r\n"
<< "Vary: Accept-Charset, Accept-Encoding, Accept-Language, Accept\r\n"
<< "Accept-Ranges: bytes\r\n"
<< "Connection: close\r\n\r\n";
<< "Accept-Ranges: bytes\r\n\r\n";
if (strcmp(request_info->request_method, "HEAD") != 0) {
out << body << "\r\n";
}
Expand All @@ -546,8 +545,7 @@ void Server::SendHttpBadRequest(struct mg_connection* const connection,
<< "Content-Type: application/json; charset=UTF-8\r\n"
<< "Cache-Control: no-cache\r\n"
<< "Vary: Accept-Charset, Accept-Encoding, Accept-Language, Accept\r\n"
<< "Accept-Ranges: bytes\r\n"
<< "Connection: close\r\n\r\n";
<< "Accept-Ranges: bytes\r\n\r\n";
if (strcmp(request_info->request_method, "HEAD") != 0) {
out << body << "\r\n";
}
Expand All @@ -566,8 +564,7 @@ void Server::SendHttpInternalError(struct mg_connection* connection,
<< "Content-Type: application/json; charset=UTF-8\r\n"
<< "Cache-Control: no-cache\r\n"
<< "Vary: Accept-Charset, Accept-Encoding, Accept-Language, Accept\r\n"
<< "Accept-Ranges: bytes\r\n"
<< "Connection: close\r\n\r\n";
<< "Accept-Ranges: bytes\r\n\r\n";
if (strcmp(request_info->request_method, "HEAD") != 0) {
out << body << "\r\n";
}
Expand All @@ -586,8 +583,7 @@ void Server::SendHttpNotFound(struct mg_connection* const connection,
<< "Content-Type: application/json; charset=UTF-8\r\n"
<< "Cache-Control: no-cache\r\n"
<< "Vary: Accept-Charset, Accept-Encoding, Accept-Language, Accept\r\n"
<< "Accept-Ranges: bytes\r\n"
<< "Connection: close\r\n\r\n";
<< "Accept-Ranges: bytes\r\n\r\n";
if (strcmp(request_info->request_method, "HEAD") != 0) {
out << body << "\r\n";
}
Expand Down Expand Up @@ -621,8 +617,7 @@ void Server::SendHttpTimeout(struct mg_connection* connection,
<< "Content-Type: application/json; charset=UTF-8\r\n"
<< "Cache-Control: no-cache\r\n"
<< "Vary: Accept-Charset, Accept-Encoding, Accept-Language, Accept\r\n"
<< "Accept-Ranges: bytes\r\n"
<< "Connection: close\r\n\r\n";
<< "Accept-Ranges: bytes\r\n\r\n";

mg_write(connection, out.str().c_str(), out.str().size());
}
Expand Down

0 comments on commit 1114ccd

Please sign in to comment.