<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185522] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185522">185522</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-06-12 15:08:46 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revise update-webkit-dependency to use LWP::UserAgent instead of LWP::Simple for better handling of https
https://bugs.webkit.org/show_bug.cgi?id=145938
Reviewed by Alexey Proskuryakov.
* Scripts/update-webkit-dependency: Switch from LWP::Simple to
LWP::UserAgent to get access to more robust HTTPS support.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsupdatewebkitdependency">trunk/Tools/Scripts/update-webkit-dependency</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185521 => 185522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-12 22:04:27 UTC (rev 185521)
+++ trunk/Tools/ChangeLog 2015-06-12 22:08:46 UTC (rev 185522)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-12 Brent Fulgham <bfulgham@apple.com>
+
+ Revise update-webkit-dependency to use LWP::UserAgent instead of LWP::Simple for better handling of https
+ https://bugs.webkit.org/show_bug.cgi?id=145938
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/update-webkit-dependency: Switch from LWP::Simple to
+ LWP::UserAgent to get access to more robust HTTPS support.
+
</ins><span class="cx"> 2015-06-12 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [GTK] Fix return type warning in WebViewTest.cpp
</span></span></pre></div>
<a id="trunkToolsScriptsupdatewebkitdependency"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/update-webkit-dependency (185521 => 185522)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/update-webkit-dependency 2015-06-12 22:04:27 UTC (rev 185521)
+++ trunk/Tools/Scripts/update-webkit-dependency 2015-06-12 22:08:46 UTC (rev 185522)
</span><span class="lines">@@ -39,7 +39,9 @@
</span><span class="cx"> use File::Temp ();
</span><span class="cx"> use FindBin;
</span><span class="cx"> use HTTP::Date qw(str2time time2str);
</span><ins>+use HTTP::Request;
</ins><span class="cx"> use LWP::Simple;
</span><ins>+use LWP::UserAgent;
</ins><span class="cx"> use POSIX;
</span><span class="cx"> use lib $FindBin::Bin;
</span><span class="cx"> use webkitdirs;
</span><span class="lines">@@ -73,19 +75,24 @@
</span><span class="cx"> my $webkitLibrariesDir = $ENV{'WEBKIT_LIBRARIES'} || File::Spec->catdir($sourceDir, "WebKitLibraries", "win");
</span><span class="cx"> my $tmpRelativeDir = File::Temp::tempdir("webkitlibsXXXXXXX", TMPDIR => 1, CLEANUP => 1);
</span><span class="cx"> my $tmpAbsDir = File::Spec->rel2abs($tmpRelativeDir);
</span><ins>+my $ua = LWP::UserAgent->new();
</ins><span class="cx">
</span><span class="cx"> print "Checking Last-Modified date of $zipFile...\n";
</span><span class="cx">
</span><del>-my ($content_type, $document_length, $modified_time, $expires, $server) = head($libsURL);
</del><ins>+my $response = $ua->get($libsURL);
</ins><span class="cx">
</span><ins>+die "Could not access $libsURL:\n" . $response->headers_as_string . "\n" unless ($response->is_success);
+
+my $content_type = $response->header('Content-Type');
+my $document_length = $response->header('Content-Length');
+my $modified_time = str2time($response->header('Last-Modified'));
+
</ins><span class="cx"> if (defined $modified_time) {
</span><del>-
</del><ins>+ print STDERR "Located a file of type $content_type, of size $document_length.\n";
</ins><span class="cx"> open NEW, ">", File::Spec->catfile($tmpAbsDir, "$file.headers");
</span><span class="cx"> print NEW "Last-Modified: " . time2str($modified_time) . "\n";
</span><span class="cx"> close NEW;
</span><del>-
</del><span class="cx"> } else {
</span><del>-
</del><span class="cx"> #Note: Neither GitHub nor DropBox emit the Last-Modified HTTP header, so fall back to a file
</span><span class="cx"> #containing the necessary information if we do not receive the information in our initial query.
</span><span class="cx"> my $headerURL = $libsURL;
</span><span class="lines">@@ -95,6 +102,7 @@
</span><span class="cx">
</span><span class="cx"> if (!is_success($result)) {
</span><span class="cx"> print STDERR "Couldn't check Last-Modified date of new $zipFile.\n";
</span><ins>+ print STDERR "Response was: $result.\n";
</ins><span class="cx"> print STDERR "Please ensure that Perl can use LWP::Simple to connect to HTTPS urls, and that $libsURL is reachable.\n";
</span><span class="cx"> print STDERR "You may have to run \$ cpan LWP::Protocol::https\n";
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>