179814 2017-11-17 00:39:48 -0800 [Win] forwarding headers should not be copies 2017-11-30 12:06:36 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 mark.salisbury webkit-unassigned achristensen annulen clopez don.olmstead fujii mark.salisbury mcatanzaro oldest_to_newest 1373002 0 mark.salisbury 2017-11-17 00:39:48 -0800 When forwarding headers are copies of header files, and both the forwarding header version and the real version of the header file are included, compile errors arise from symbols being defined multiple times. Instead of copying the header file we should create a forwarding header that contains a #include path to the real header. The copy command is unique to the Windows... Konstantin Tokarev said in reply (see to mail subject "[webkit-dev] unified sources build + forwarding headers that are copies") : "AFAIK Windows uses different approach because AppleWin needs to support separate building of WTF, WebCore, and WebKit." 1373003 1 327155 mark.salisbury 2017-11-17 00:42:11 -0800 Created attachment 327155 Proposed fix I've tested this with WinCairo build and it was successful building. 1373004 2 mark.salisbury 2017-11-17 00:44:11 -0800 After submitting I realized I intended to check that the build stops if the perl script returns an error. The perl script will return an error if a particular forwarding header already exists but has a different path than the expected path. This could happen if there are two header files in JavaScriptCore with the same name, which would be unexpected. I'll plan to submit a new patch. 1373014 3 327160 mark.salisbury 2017-11-17 03:00:10 -0800 Created attachment 327160 Patch set #2 checks if the perl script to create forwarding headers returns an error; if so it causes the batch script to return an error and the build stops. hmmm... I realize my patch isn't formatted quite right. Some time later I suppose I'll have to figure out why prepare-ChangeLog is dying: D:\git\webkit-upstream>perl Tools\Scripts\prepare-ChangeLog --git-commit=HEAD~1...HEAD Running status to find changed, added, or removed files. Reviewing diff to determine which lines changed. Extracting affected function names from source files. Use of uninitialized value $first_line in pattern match (m//) at Tools\Scripts\prepare-ChangeLog line 765. Change author: Mark Salisbury <mark.salisbury@hp.com>. Editing the Source\JavaScriptCore\ChangeLog file. -- Please remember to include a detailed description in your ChangeLog entry. -- -- See <http://webkit.org/coding/contributing.html> for more info -- I found a bug in webkit-patch if SVN is not installed... I'll have to submit a fix for that. 1373017 4 clopez 2017-11-17 03:17:01 -0800 (In reply to Mark Salisbury from comment #3) > I found a bug in webkit-patch if SVN is not installed... I'll have to > submit a fix for that. Not sure if that is a bug. The WebKit repository uses SVN. This means that if you want to use git and use the developer tools for sending patches and committing you need to configure also the git-svn integration as described https://webkit.org/getting-the-code/#checking-out-with-git 1373019 5 annulen 2017-11-17 03:27:57 -0800 I think this patch will be rejected because of what is said in my quote. PlatformWin.cmake is used by both WinCairo and AppleWin, and it's nothing like generic support of platform Windows in WebKit, no, it's port-specific build system like PlatformGTK.cmake or PlatformWPE.cmake 1373020 6 annulen 2017-11-17 03:30:11 -0800 If patch is changed to be WinCairo-specific it might be accepted if Sony folks have nothing against it 1373022 7 mark.salisbury 2017-11-17 03:51:13 -0800 (In reply to Carlos Alberto Lopez Perez from comment #4) > (In reply to Mark Salisbury from comment #3) > > I found a bug in webkit-patch if SVN is not installed... I'll have to > > submit a fix for that. > > Not sure if that is a bug. The WebKit repository uses SVN. This means that > if you want to use git and use the developer tools for sending patches and > committing you need to configure also the git-svn integration as described > https://webkit.org/getting-the-code/#checking-out-with-git Interesting. Seems like SVN should only be required if you want to commit directly to SVN. I read this page: https://trac.webkit.org/wiki/UsingGitWithWebKit and while it doesn't say you don't need to install SVN, it says tools have been updated to work with a GIT workflow. 1373023 8 mark.salisbury 2017-11-17 03:54:50 -0800 (In reply to Konstantin Tokarev from comment #5) > I think this patch will be rejected because of what is said in my quote. > PlatformWin.cmake is used by both WinCairo and AppleWin, and it's nothing > like generic support of platform Windows in WebKit, no, it's port-specific > build system like PlatformGTK.cmake or PlatformWPE.cmake Right. What I'm ultimately working on is running WPE on Windows, but I'm not trying to upstream anything directly related to that yet. I think fundamentally that making copies of headers is going to cause headaches down the road, if it hasn't already (for folks besides me). 1373024 9 327160 annulen 2017-11-17 04:10:22 -0800 Comment on attachment 327160 Patch set #2 checks if the perl script to create forwarding headers returns an error; if so it causes the batch script to return an error and the build stops. View in context: https://bugs.webkit.org/attachment.cgi?id=327160&action=review > Source/JavaScriptCore/PlatformWin.cmake:44 > +file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "perl ${JAVASCRIPTCORE_DIR}/Scripts/make-forwarding-headers.pl \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/JavaScriptCore\" \"${FORWARDING_HEADERS_DIR}/JavaScriptCore\"\n") I think better approach would be to pass list of globs as arguments to one script invocation, and ditch preBuild.cmd file altogether, replacing JavaScriptCore_PRE_BUILD_COMMAND with script invocation At very least use && to join commands instead of "if %errorlevel% NEQ 0 exit /b 1\n" > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:1 > +use strict; It's also a good practice to add "use warnings" to all scripts, unfortunately many our scripts don't > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:5 > +my $searchPath = shift; you'll need Getopt::Long > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:10 > +foreach(@headers) { use explicit name for iterator > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:12 > + my $forwardingHeader = $forwardingDir.'/'.$file; use File::Spec->join > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:15 > + open (HEADER, $forwardingHeader) or die("Unable to open $forwardingHeader"); Barewords for file handles are bad practice, use my $header Don't forget to add $! into your die messages open without '<' is fragile, if it happens that file name starts with special character it may lead to unexpected result > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:21 > + print "Creating forwarding header $forwardingHeader with #include \"$includePath/$file\"\n"; Don't duplicate $fileContent here, chomp it, or add "\n" in the next statement > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:24 > + close(HEADER); Better check errors in close too. This may not be incredibly useful for files, but for other types of handles it's really needed (e.g. pipes). Just keep in mind 1373025 10 mark.salisbury 2017-11-17 04:25:37 -0800 (In reply to Konstantin Tokarev from comment #9) > Comment on attachment 327160 [details] > Patch set #2 checks if the perl script to create forwarding headers returns > an error; if so it causes the batch script to return an error and the build > stops. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=327160&action=review > > > Source/JavaScriptCore/PlatformWin.cmake:44 > > +file(WRITE "${JavaScriptCore_POST_BUILD_COMMAND}" "perl ${JAVASCRIPTCORE_DIR}/Scripts/make-forwarding-headers.pl \"${DERIVED_SOURCES_DIR}/JavaScriptCore/*.h\" \"${DERIVED_SOURCES_DIR}/JavaScriptCore\" \"${FORWARDING_HEADERS_DIR}/JavaScriptCore\"\n") > > I think better approach would be to pass list of globs as arguments to one > script invocation, and ditch preBuild.cmd file altogether, replacing > JavaScriptCore_PRE_BUILD_COMMAND with script invocation That was my approach on my first pass. I had trouble with CMake and multiple lines... I could give it another shot though. > > At very least use && to join commands instead of "if %errorlevel% NEQ 0 exit > /b 1\n" > > > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:1 > > +use strict; > > It's also a good practice to add "use warnings" to all scripts, > unfortunately many our scripts don't > > > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:5 > > +my $searchPath = shift; > > you'll need Getopt::Long > > > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:10 > > +foreach(@headers) { > > use explicit name for iterator > > > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:12 > > + my $forwardingHeader = $forwardingDir.'/'.$file; > > use File::Spec->join > > > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:15 > > + open (HEADER, $forwardingHeader) or die("Unable to open $forwardingHeader"); > > Barewords for file handles are bad practice, use my $header > > Don't forget to add $! into your die messages > > open without '<' is fragile, if it happens that file name starts with > special character it may lead to unexpected result > > > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:21 > > + print "Creating forwarding header $forwardingHeader with #include \"$includePath/$file\"\n"; > > Don't duplicate $fileContent here, chomp it, or add "\n" in the next > statement > > > Source/JavaScriptCore/Scripts/make-forwarding-headers.pl:24 > > + close(HEADER); > > Better check errors in close too. This may not be incredibly useful for > files, but for other types of handles it's really needed (e.g. pipes). Just > keep in mind Great suggestions. perl isn't my strongest area. 1373026 11 mark.salisbury 2017-11-17 05:08:05 -0800 OK, on the first suggestion - scrap the preBuild.cmd on postBuild.cmd scripts - I tried again. I'm running into a problem with quotes and I think *maybe* this is why these were written as .cmd files in the first place. CMake uses one set of rules for quoting strings when writing to a file, which seem sane, but for building up a string directly quotes get wonky fast. For example, a line like this: set(var "${var}here is some text \"now it is quoted\"") ends up leaving the quotes at the beginning and end of the line. and the escapes are also left in. I also tried this: set(var ${var}here is some text "now it is quoted") this takes quotes out completely. And this: set(var ${var}here is some text \"now it is quoted\") leaves the escapes in. So I'm going to stick with .cmd files unless someone can show me an example of how to concatenate strings with quotes successfully. I'm thinking not to '&&' all the script invocations together because there is a limit on how many characters you can have for a single command. I read it's 8192 chars and we're very close to that. As far as globbing all the dirs together for a single invocation, I'm trying to do what I think is a little easier to read. It seems to execute plenty fast with multiple invocations. 1373029 12 327163 mark.salisbury 2017-11-17 05:46:36 -0800 Created attachment 327163 Proposed fix I believe I addressed everything you requested in the perl script with the exception of: "Don't duplicate $fileContent here, chomp it, or add "\n" in the next statement" I wasn't sure how to interpret that... 1373034 13 annulen 2017-11-17 05:50:52 -0800 I mean just print chomp($fileContent) instead of duplicating "#include...", or don't add trailing \n when $fileContent is assigned, and do print $header $fileContent, "\n" in the next line 1373035 14 annulen 2017-11-17 05:52:10 -0800 Actually I don't think you need to mess with this code at all, if you are only interested in WPE 1373036 15 mark.salisbury 2017-11-17 05:58:22 -0800 (In reply to Konstantin Tokarev from comment #14) > Actually I don't think you need to mess with this code at all, if you are > only interested in WPE While brining up a WPE build on Windows we discovered that we needed the forwarding headers for JavaScriptCore. We copied the same xcopy code that Windows builds use. Then later I started getting zillions of compile errors from multiply defined symbols. Some even caused compiler crashes. So I analyzed the problem, decided the root of the problem was exactly what this bug says. As far as how we might introduce a WPE build on Windows, it'd be nice to avoid copying the code but perhaps locating common OS(WINDOWS) code to one place. Even if we don't do that, I think it still is logical to fix this for Windows builds too. I think they will likely see it sooner or later. If you guys don't believe this is fundamentally a potential problem (of copying headers), then we can close this bug. Thanks for your time so far! 1373039 16 327166 mark.salisbury 2017-11-17 06:06:59 -0800 Created attachment 327166 Proposed fix OK, got it. Removed the trailing \n. 1373041 17 annulen 2017-11-17 06:15:22 -0800 WPE uses Source/WebKit/Scripts/generate-forwarding-headers.pl which should generate all needed forwarding headers (maybe you need to add --platform win there though) 1373042 18 mark.salisbury 2017-11-17 06:29:22 -0800 (In reply to Konstantin Tokarev from comment #17) > WPE uses Source/WebKit/Scripts/generate-forwarding-headers.pl which should > generate all needed forwarding headers (maybe you need to add --platform win > there though) PlatformWin, GTK, and WPE all use that script. You have a good point though. Why was the xcopy forwarding header script ever added in the first place? I'll look at the history when this was introduced. It produces far more forwarding headers for JavaSriptCore than Source/WebKit/Scripts/generate-forwarding-headers.pl does... Until I have an answer I would suggest not taking this patch. I think there's still a problem here (xcopy causes problems) but I'm not sure I'm solving it in the right way. Is there a way to clear review? commit-queue? 1373043 19 annulen 2017-11-17 06:34:49 -0800 (In reply to Mark Salisbury from comment #18) > (In reply to Konstantin Tokarev from comment #17) > > WPE uses Source/WebKit/Scripts/generate-forwarding-headers.pl which should > > generate all needed forwarding headers (maybe you need to add --platform win > > there though) > > PlatformWin, GTK, and WPE all use that script. Out of tree Qt port (which I'm developing) also uses it (on Windows too). > > You have a good point though. Why was the xcopy forwarding header script > ever added in the first place? I'll look at the history when this was > introduced. Because AppleWin needs to support separate building of WTF, WebCore, and WebKit, they want to copy all header files. > > It produces far more forwarding headers for JavaSriptCore than > Source/WebKit/Scripts/generate-forwarding-headers.pl does... Just as planned. > > Until I have an answer I would suggest not taking this patch. I think > there's still a problem here (xcopy causes problems) but I'm not sure I'm > solving it in the right way. > > Is there a way to clear review? commit-queue? Same way as you set them 1373044 20 don.olmstead 2017-11-17 06:40:03 -0800 (In reply to Mark Salisbury from comment #0) > When forwarding headers are copies of header files, and both the forwarding > header version and the real version of the header file are included, compile > errors arise from symbols being defined multiple times. > > Instead of copying the header file we should create a forwarding header that > contains a #include path to the real header. The copy command is unique to > the Windows... > > Konstantin Tokarev said in reply (see to mail subject "[webkit-dev] unified > sources build + forwarding headers that are copies") : > > "AFAIK Windows uses different approach because AppleWin needs to support > separate building of WTF, WebCore, and WebKit." It’s my understanding that the copy is present in ALL Apple ports. I think it’s better for the project as a whole for everyone to move to copying the headers for consistency. 1373053 21 mcatanzaro 2017-11-17 07:23:45 -0800 Note: Apple's CMake build does not copy the headers. 1373059 22 don.olmstead 2017-11-17 07:52:02 -0800 (In reply to Michael Catanzaro from comment #21) > Note: Apple's CMake build does not copy the headers. But it’s not shipping anything. Is there any reason why we shouldn’t just copy the headers in CMake ports? 1373069 23 annulen 2017-11-17 08:21:02 -0800 >Is there any reason why we shouldn’t just copy the headers in CMake ports? You mean avoid copying? Because doing otherwise is a regression and leads to possible #pragma once problems described by Mark. 1373152 24 don.olmstead 2017-11-17 10:52:23 -0800 (In reply to Konstantin Tokarev from comment #23) > >Is there any reason why we shouldn’t just copy the headers in CMake ports? > > You mean avoid copying? Because doing otherwise is a regression and leads to > possible #pragma once problems described by Mark. I'm saying why don't we fix what's wrong within CMake or whatever else is happening to cause the #pragma once issue so it is consistent with what Apple is doing when they just copy the headers. If we think of WTF, JSC, etc as something that can be built independently then at the end we would have an "install" step that would put the headers where they need to be so WebCore, WebKit, etc can build. 1373160 25 mcatanzaro 2017-11-17 10:57:47 -0800 (In reply to Don Olmstead from comment #24) > (In reply to Konstantin Tokarev from comment #23) > > >Is there any reason why we shouldn’t just copy the headers in CMake ports? > > > > You mean avoid copying? Because doing otherwise is a regression and leads to > > possible #pragma once problems described by Mark. > > I'm saying why don't we fix what's wrong within CMake or whatever else is > happening to cause the #pragma once issue so it is consistent with what > Apple is doing when they just copy the headers. Copying headers is fundamentally incompatible with #pragma once. The real question here is: why does Apple Windows build at all? I would expect it to be broken too. 1373173 26 don.olmstead 2017-11-17 11:27:52 -0800 (In reply to Michael Catanzaro from comment #25) > (In reply to Don Olmstead from comment #24) > > (In reply to Konstantin Tokarev from comment #23) > > > >Is there any reason why we shouldn’t just copy the headers in CMake ports? > > > > > > You mean avoid copying? Because doing otherwise is a regression and leads to > > > possible #pragma once problems described by Mark. > > > > I'm saying why don't we fix what's wrong within CMake or whatever else is > > happening to cause the #pragma once issue so it is consistent with what > > Apple is doing when they just copy the headers. > > Copying headers is fundamentally incompatible with #pragma once. > > The real question here is: why does Apple Windows build at all? I would > expect it to be broken too. Not everything is using #pragma once. See https://bugs.webkit.org/show_bug.cgi?id=174986 where some wtf headers aren't working. Then there's https://bugs.webkit.org/show_bug.cgi?id=177202. These are all fundamentally the same bug. If you want to get an idea on what is and isn't using #pragma once https://github.com/cgmb/guardonce is a nice python utility. Its my understanding that Apple has a HARD requirement that each library be able to be built independently. There is also the requirement that if a library can be built as a framework then the headers need to be flat, eg #include <WebCore/Foo.h>. That is the only reason pal and wtf are not flat since they're built statically. Internally we've been looking at how to solve this with copying for all CMake ports. We don't have anything completed yet but we are hitting the same issue Mark is hitting with WebKit(2) support on WinCairo. 1373434 27 mark.salisbury 2017-11-17 17:01:35 -0800 I believe that both Windows ports (AppleWin, WinCairo) have the same xcopy logic to create forwarding headers. Source\JavaScriptCore\PlatformWin.cmake is used by both CMake builds. The copy was introduced here: https://bugs.webkit.org/show_bug.cgi?id=148198 "CMake Windows build should not include files directly from other Source direc..." At that time I don't think #pragma once was being used. The rationale was as has been mentioned so that the next projects (frameworks) could include previous frameworks with a simple #include <JavaScriptCore/SomeJSFile.h>. There's no careful selection of what public .h files should be, and it'd be hard to do so anyway since one .h file can lead to many others, sometimes ones you don't expect. So here's where I am with this now. My current patch has an incompatibility with WebKit/Scripts/generate-forwarding-headers.pl. They both try to create forwarding headers for some of the same JavaScriptCore files. I print the full path to the .h file and WebKit/Scripts/generate-forwarding-headers.pl lists out a relative path. WebKit/Scripts/generate-forwarding-headers.pl overwrites that path that the script in this patch products. The reason I went with the full path is that I saw a problem with infinite recursion of a forwarding header include. The forwarding header include path came before the real directory, so once an include started on a forwarding header, it tried to include the exact same file again. A #pragma once in the forwarding header would prevent the re-inclusion, however, it would also fail to include the real .h file. The infinite recursion to me means that there is some ordering difference in header search paths between my build and WinCairo build. I see a couple of options, if I am to pursue preventing copying of .h files (which I hope others agree fundamentally doesn't make sense): 1) Modify WebKit/Scripts/generate-forwarding-headers.pl so that it prints the full path to the real header. Then the order of header search paths doesn't matter. This does make the derived sources output (forwarding headers) not relocatable. I don't know if it needs to be. I believe these .h files are just used in an internal build. The real public .h files from WebKit are JavaScriptCore API and WebKit API files. 2) Figure out why my Win WPE build has a different header search path order than WinCairo. The forwarding header include path has to come AFTER the include search path that triggers finding the real .h file. In practice I think that means the forwarding header path should come last. Thoughts? Thanks everyone. I've been a downstream user of WebKit for quite a while now and feel bad that I haven't been able to give back more. I'm hoping to be a better citizen as we are now working on updating our WebKit version (used in HP products). 1373450 28 mark.salisbury 2017-11-17 17:28:09 -0800 (In reply to Mark Salisbury from comment #27) > 2) Figure out why my Win WPE build has a different header search path order > than WinCairo. The forwarding header include path has to come AFTER the > include search path that triggers finding the real .h file. In practice I > think that means the forwarding header path should come last. It doesn't have a different search order. WinCairo has ForwardingHeaders first too. This wasn't a problem when the files were copies. I still believe the same options apply though: 1) Make the forwarding header paths full paths 2) Move fowarding header include path to the end of the includes paths I like #1 better. For the curious, here's the example I included in e-mail about how the same header file gets included twice. There were many others: First source file including ArrayBufferSharingMode.h: 1>Note: including file: D:\git\webkit-org\Source\WebCore\css/DOMMatrix.cpp 1>Note: including file: D:\git\webkit-org\Source\WebCore\config.h 1>Note: including file: d:\git\webkit-org\source\webcore\css\DOMMatrix.h 1>Note: including file: d:\git\webkit-org\source\webcore\css\DOMMatrixReadOnly.h 1>Note: including file: d:\git\webkit-org\source\webcore\css\DOMMatrixInit.h 1>Note: including file: d:\git\webkit-org\source\webcore\css\DOMMatrix2DInit.h 1>Note: including file: D:\git\webkit-org\Source\WebCore\bindings\js\ScriptWrappable.h 1>Note: including file: D:\git\webkit-org\Source\JavaScriptCore\heap/Weak.h 1>Note: including file: D:\git\webkit-org\Source\WebCore\platform\graphics\transforms\TransformationMatrix.h 1>Note: including file: D:\git\webkit-org\Source\WebCore\platform\graphics\FloatPoint.h 1>Note: including file: d:\git\webkit-org\source\webcore\platform\graphics\FloatSize.h 1>Note: including file: d:\git\webkit-org\source\webcore\platform\graphics\IntPoint.h 1>Note: including file: d:\git\webkit-org\source\webcore\platform\graphics\IntSize.h 1>Note: including file: D:\git\webkit-org\Source\WebCore\platform\graphics\FloatPoint3D.h 1>Note: including file: D:\git\webkit-org\Source\JavaScriptCore\runtime/Float32Array.h 1>Note: including file: d:\git\webkit-org\source\javascriptcore\runtime\TypedArrays.h 1>Note: including file: d:\git\webkit-org\source\javascriptcore\runtime\GenericTypedArrayView.h 1>Note: including file: d:\git\webkit-org\source\javascriptcore\runtime\ArrayBuffer.h 1>Note: including file: d:\git\webkit-org\source\javascriptcore\runtime\ArrayBufferSharingMode.h Second source file including ArrayBufferSharingMode.h: 1>Note: including file: D:\git\webkit-org\Source\WebCore\css/DOMMatrixReadOnly.cpp 1>Note: including file: D:\git\webkit-org\Source\WebCore\config.h 1>Note: including file: d:\git\webkit-org\source\webcore\css\CSSToLengthConversionData.h 1>Note: including file: D:\git\webkit-org\Source\WebCore\dom\DOMPoint.h 1>Note: including file: d:\git\webkit-org\source\webcore\dom\DOMPointReadOnly.h 1>Note: including file: d:\git\webkit-org\source\webcore\dom\DOMPointInit.h 1>Note: including file: d:\git\webkit-org\source\webcore\css\TransformFunctions.h 1>Note: including file: D:\git\webkit-org\Source\WebCore\platform\graphics\transforms\TransformOperations.h 1>Note: including file: D:\git\webkit-org\Source\WebCore\platform\graphics\LayoutSize.h 1>Note: including file: d:\git\webkit-org\source\webcore\platform\graphics\transforms\TransformOperation.h 1>Note: including file: D:\git\webkit-org\WebKitBuild\Debug\DerivedSources\ForwardingHeaders\JavaScriptCore/GenericTypedArrayViewInlines.h 1>Note: including file: d:\git\webkit-org\webkitbuild\debug\derivedsources\forwardingheaders\javascriptcore\GenericTypedArrayView.h 1>Note: including file: d:\git\webkit-org\webkitbuild\debug\derivedsources\forwardingheaders\javascriptcore\ArrayBuffer.h 1>Note: including file: d:\git\webkit-org\webkitbuild\debug\derivedsources\forwardingheaders\javascriptcore\ArrayBufferSharingMode.h 1373804 29 don.olmstead 2017-11-20 10:50:31 -0800 (In reply to Mark Salisbury from comment #28) > (In reply to Mark Salisbury from comment #27) > > > 2) Figure out why my Win WPE build has a different header search path order > > than WinCairo. The forwarding header include path has to come AFTER the > > include search path that triggers finding the real .h file. In practice I > > think that means the forwarding header path should come last. > > It doesn't have a different search order. WinCairo has ForwardingHeaders > first too. This wasn't a problem when the files were copies. > > I still believe the same options apply though: > > 1) Make the forwarding header paths full paths > 2) Move fowarding header include path to the end of the includes paths > > I like #1 better. > > For the curious, here's the example I included in e-mail about how the same > header file gets included twice. There were many others: > > First source file including ArrayBufferSharingMode.h: > > 1>Note: including file: D:\git\webkit-org\Source\WebCore\css/DOMMatrix.cpp > 1>Note: including file: D:\git\webkit-org\Source\WebCore\config.h > 1>Note: including file: d:\git\webkit-org\source\webcore\css\DOMMatrix.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\css\DOMMatrixReadOnly.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\css\DOMMatrixInit.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\css\DOMMatrix2DInit.h > 1>Note: including file: > D:\git\webkit-org\Source\WebCore\bindings\js\ScriptWrappable.h > 1>Note: including file: > D:\git\webkit-org\Source\JavaScriptCore\heap/Weak.h > 1>Note: including file: > D:\git\webkit- > org\Source\WebCore\platform\graphics\transforms\TransformationMatrix.h > 1>Note: including file: > D:\git\webkit-org\Source\WebCore\platform\graphics\FloatPoint.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\platform\graphics\FloatSize.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\platform\graphics\IntPoint.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\platform\graphics\IntSize.h > 1>Note: including file: > D:\git\webkit-org\Source\WebCore\platform\graphics\FloatPoint3D.h > 1>Note: including file: > D:\git\webkit-org\Source\JavaScriptCore\runtime/Float32Array.h > 1>Note: including file: > d:\git\webkit-org\source\javascriptcore\runtime\TypedArrays.h > 1>Note: including file: > d:\git\webkit-org\source\javascriptcore\runtime\GenericTypedArrayView.h > 1>Note: including file: > d:\git\webkit-org\source\javascriptcore\runtime\ArrayBuffer.h > 1>Note: including file: > d:\git\webkit-org\source\javascriptcore\runtime\ArrayBufferSharingMode.h > > Second source file including ArrayBufferSharingMode.h: > > 1>Note: including file: > D:\git\webkit-org\Source\WebCore\css/DOMMatrixReadOnly.cpp > 1>Note: including file: D:\git\webkit-org\Source\WebCore\config.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\css\CSSToLengthConversionData.h > 1>Note: including file: D:\git\webkit-org\Source\WebCore\dom\DOMPoint.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\dom\DOMPointReadOnly.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\dom\DOMPointInit.h > 1>Note: including file: > d:\git\webkit-org\source\webcore\css\TransformFunctions.h > 1>Note: including file: > D:\git\webkit- > org\Source\WebCore\platform\graphics\transforms\TransformOperations.h > 1>Note: including file: > D:\git\webkit-org\Source\WebCore\platform\graphics\LayoutSize.h > 1>Note: including file: > d:\git\webkit- > org\source\webcore\platform\graphics\transforms\TransformOperation.h > 1>Note: including file: > D:\git\webkit- > org\WebKitBuild\Debug\DerivedSources\ForwardingHeaders\JavaScriptCore/ > GenericTypedArrayViewInlines.h > 1>Note: including file: > d:\git\webkit- > org\webkitbuild\debug\derivedsources\forwardingheaders\javascriptcore\Generic > TypedArrayView.h > 1>Note: including file: > d:\git\webkit- > org\webkitbuild\debug\derivedsources\forwardingheaders\javascriptcore\ArrayBu > ffer.h > 1>Note: including file: > d:\git\webkit- > org\webkitbuild\debug\derivedsources\forwardingheaders\javascriptcore\ArrayBu > fferSharingMode.h What if within the JavaScriptCore/CMakeLists.txt if you change JavaScriptCore_INCLUDE_DIRECTORIES into JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES? Then those include directories shouldn't propagate to WebCore and you shouldn't end up in d:\git\webkit-org\source\javascriptcore\runtime\ArrayBufferSharingMode.h. 1373805 30 annulen 2017-11-20 10:52:09 -0800 Then we again end up with duplicated include directory listings in each CMakeLists.txt 1373806 31 annulen 2017-11-20 10:52:53 -0800 It makes sense to make them private if headers are copied though 1374995 32 achristensen 2017-11-27 10:38:11 -0800 (In reply to Don Olmstead from comment #20) > It’s my understanding that the copy is present in ALL Apple ports. I think > it’s better for the project as a whole for everyone to move to copying the > headers for consistency. I agree. (In reply to Michael Catanzaro from comment #25) > Copying headers is fundamentally incompatible with #pragma once. This is not true if we include directories well. For example, when building WTF we should include the Source/WTF directory and not the directory containing the copies and when building everything else we should include the directory containing the copies. When building JSC we should include Source/JavaScriptCore and not the directory containing the copies and when building everything else we should include the directory containing the copies. Etc. 1375569 33 mark.salisbury 2017-11-28 15:29:55 -0800 > What if within the JavaScriptCore/CMakeLists.txt if you change > JavaScriptCore_INCLUDE_DIRECTORIES into > JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES? Then those include directories > shouldn't propagate to WebCore and you shouldn't end up in > d:\git\webkit-org\source\javascriptcore\runtime\ArrayBufferSharingMode.h. I'll try that. 1375580 34 mark.salisbury 2017-11-28 15:52:45 -0800 (In reply to Alex Christensen from comment #32) > (In reply to Don Olmstead from comment #20) > > It’s my understanding that the copy is present in ALL Apple ports. I think > > it’s better for the project as a whole for everyone to move to copying the > > headers for consistency. > > I agree. > > (In reply to Michael Catanzaro from comment #25) > > Copying headers is fundamentally incompatible with #pragma once. > > This is not true if we include directories well. For example, when building > WTF we should include the Source/WTF directory and not the directory > containing the copies and when building everything else we should include > the directory containing the copies. When building JSC we should include > Source/JavaScriptCore and not the directory containing the copies and when > building everything else we should include the directory containing the > copies. Etc. Sounds like that would work. I do think having copies of .h files in different places is kludgy. As long as the discussion is around what's ideal, wouldn't it be better not to need forwarding headers at all? What if all #includes were relative to either the top level source directory or to the derived sources directory? This might even make compiles a little bit faster since they wouldn't have to search so many directories. It'd make build output files smaller ;) It would make code more readable. What problems would arise from this? 1375589 35 don.olmstead 2017-11-28 16:17:00 -0800 (In reply to Mark Salisbury from comment #34) > (In reply to Alex Christensen from comment #32) > > (In reply to Don Olmstead from comment #20) > > > It’s my understanding that the copy is present in ALL Apple ports. I think > > > it’s better for the project as a whole for everyone to move to copying the > > > headers for consistency. > > > > I agree. > > > > (In reply to Michael Catanzaro from comment #25) > > > Copying headers is fundamentally incompatible with #pragma once. > > > > This is not true if we include directories well. For example, when building > > WTF we should include the Source/WTF directory and not the directory > > containing the copies and when building everything else we should include > > the directory containing the copies. When building JSC we should include > > Source/JavaScriptCore and not the directory containing the copies and when > > building everything else we should include the directory containing the > > copies. Etc. > > Sounds like that would work. I do think having copies of .h files in > different places is kludgy. > > As long as the discussion is around what's ideal, wouldn't it be better not > to need forwarding headers at all? > > What if all #includes were relative to either the top level source directory > or to the derived sources directory? This might even make compiles a little > bit faster since they wouldn't have to search so many directories. It'd > make build output files smaller ;) It would make code more readable. > > What problems would arise from this? https://bugs.webkit.org/show_bug.cgi?id=180063#c5 1376443 36 mark.salisbury 2017-11-30 12:06:36 -0800 Apple has a requirement for forwarding headers to be copies: https://bugs.webkit.org/show_bug.cgi?id=180063#c5 The problem I'm running into can likely be addressed by ensuring that PRIVATE headers aren't leaked into the next project's include paths. 327155 2017-11-17 00:42:11 -0800 2017-11-17 03:00:10 -0800 Proposed fix 0001-Win-forwarding-headers-should-not-be-copies.patch text/plain 4041 mark.salisbury RnJvbSAwMGNmMzg0NGUwNDFkOWYzNjI2OTlhMWVmY2E3ZjMxNDM4N2ZkODdiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIFNhbGlzYnVyeSA8bWFyay5zYWxpc2J1cnlAaHAuY29t PgpEYXRlOiBGcmksIDE3IE5vdiAyMDE3IDA5OjU2OjQwICswOTAwClN1YmplY3Q6IFtQQVRDSF0g W1dpbl0gZm9yd2FyZGluZyBoZWFkZXJzIHNob3VsZCBub3QgYmUgY29waWVzCgpGb3J3YXJkaW5n IGhlYWRlcnMgY3JlYXRlZCBieSBKYXZhU2NyaXB0Q29yZSBhcmUgY3VycmVudGx5IGNvcGllcwpv ZiBmaWxlcywgbm90IGZpbGVzIHdoaWNoIGhhdmUgYSAjaW5jbHVkZSBwYXRoIHRvIHRoZSByZWFs IGhlYWRlciBmaWxlLgoKVGhlIHByb2JsZW0gd2l0aCB0aGlzIGFwcHJvYWNoIGlzIHRoYXQgaWYg dGhlIHNhbWUgZmlsZSBlbmRzIHVwIGJlaW5nCmluY2x1ZGVkIHR3aWNlLCBidXQgYXQgZGlmZmVy ZW50IHBhdGhzLCB0aGUgI3ByYWdtYSBvbmNlIGRvZXMgbm90aGluZwphbmQgY29tcGlsZSBlcnJv cnMgb2NjdXIgZnJvbSBtdWx0aXBseSBkZWZpbmVkIHN5bWJvbHMuCi0tLQogU291cmNlL0phdmFT Y3JpcHRDb3JlL1BsYXRmb3JtV2luLmNtYWtlICAgICAgICAgICAgfCAgOCArKystLS0tCiAuLi4v U2NyaXB0cy9tYWtlLWZvcndhcmRpbmctaGVhZGVycy5wbCAgICAgICAgICAgICB8IDI1ICsrKysr KysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMjggaW5zZXJ0aW9ucygrKSwgNSBk ZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvU2Ny aXB0cy9tYWtlLWZvcndhcmRpbmctaGVhZGVycy5wbAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9QbGF0Zm9ybVdpbi5jbWFrZSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0 Zm9ybVdpbi5jbWFrZQppbmRleCBiMzQ4ZWFlYWZiYS4uMDIwMmM1ZjFmMWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0Zm9ybVdpbi5jbWFrZQorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvUGxhdGZvcm1XaW4uY21ha2UKQEAgLTM0LDE1ICszNCwxMyBAQCBmaWxlKENP UFkKICkKIAogZmlsZShNQUtFX0RJUkVDVE9SWSAke0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9L0ph dmFTY3JpcHRDb3JlKQotCiBzZXQoSmF2YVNjcmlwdENvcmVfUFJFX0JVSUxEX0NPTU1BTkQgIiR7 Q01BS0VfQklOQVJZX0RJUn0vRGVyaXZlZFNvdXJjZXMvSmF2YVNjcmlwdENvcmUvcHJlQnVpbGQu Y21kIikKIGZpbGUoUkVNT1ZFICIke0phdmFTY3JpcHRDb3JlX1BSRV9CVUlMRF9DT01NQU5EfSIp CiBmb3JlYWNoIChfZGlyZWN0b3J5ICR7SmF2YVNjcmlwdENvcmVfRk9SV0FSRElOR19IRUFERVJT X0RJUkVDVE9SSUVTfSkKLSAgICBmaWxlKEFQUEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QUkVfQlVJ TERfQ09NTUFORH0iICJAeGNvcHkgL3kgL2QgL2YgXCIke0pBVkFTQ1JJUFRDT1JFX0RJUn0vJHtf ZGlyZWN0b3J5fS8qLmhcIiBcIiR7Rk9SV0FSRElOR19IRUFERVJTX0RJUn0vSmF2YVNjcmlwdENv cmVcIiA+bnVsIDI+bnVsXG4iKQorICAgIGZpbGUoQVBQRU5EICIke0phdmFTY3JpcHRDb3JlX1BS RV9CVUlMRF9DT01NQU5EfSIgInBlcmwgJHtKQVZBU0NSSVBUQ09SRV9ESVJ9L1NjcmlwdHMvbWFr ZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwgXCIke0pBVkFTQ1JJUFRDT1JFX0RJUn0vJHtfZGlyZWN0 b3J5fS8qLmhcIiBcIiR7SkFWQVNDUklQVENPUkVfRElSfS8ke19kaXJlY3Rvcnl9XCIgXCIke0ZP UldBUkRJTkdfSEVBREVSU19ESVJ9L0phdmFTY3JpcHRDb3JlXCJcbiIpCiBlbmRmb3JlYWNoICgp Ci0KIHNldChKYXZhU2NyaXB0Q29yZV9QT1NUX0JVSUxEX0NPTU1BTkQgIiR7Q01BS0VfQklOQVJZ X0RJUn0vRGVyaXZlZFNvdXJjZXMvSmF2YVNjcmlwdENvcmUvcG9zdEJ1aWxkLmNtZCIpCi1maWxl KFdSSVRFICIke0phdmFTY3JpcHRDb3JlX1BPU1RfQlVJTERfQ09NTUFORH0iICJAeGNvcHkgL3kg L2QgL2YgXCIke0RFUklWRURfU09VUkNFU19ESVJ9L0phdmFTY3JpcHRDb3JlLyouaFwiIFwiJHtG T1JXQVJESU5HX0hFQURFUlNfRElSfS9KYXZhU2NyaXB0Q29yZVwiID5udWwgMj5udWxcbiIpCi1m aWxlKEFQUEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QT1NUX0JVSUxEX0NPTU1BTkR9IiAiQHhjb3B5 IC95IC9kIC9mIFwiJHtERVJJVkVEX1NPVVJDRVNfRElSfS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvKi5oXCIgXCIke0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9L0phdmFTY3JpcHRDb3JlXCIgPm51 bCAyPm51bFxuIikKK2ZpbGUoV1JJVEUgIiR7SmF2YVNjcmlwdENvcmVfUE9TVF9CVUlMRF9DT01N QU5EfSIgInBlcmwgJHtKQVZBU0NSSVBUQ09SRV9ESVJ9L1NjcmlwdHMvbWFrZS1mb3J3YXJkaW5n LWhlYWRlcnMucGwgXCIke0RFUklWRURfU09VUkNFU19ESVJ9L0phdmFTY3JpcHRDb3JlLyouaFwi IFwiJHtERVJJVkVEX1NPVVJDRVNfRElSfS9KYXZhU2NyaXB0Q29yZVwiIFwiJHtGT1JXQVJESU5H X0hFQURFUlNfRElSfS9KYXZhU2NyaXB0Q29yZVwiXG4iKQorZmlsZShBUFBFTkQgIiR7SmF2YVNj cmlwdENvcmVfUE9TVF9CVUlMRF9DT01NQU5EfSIgInBlcmwgJHtKQVZBU0NSSVBUQ09SRV9ESVJ9 L1NjcmlwdHMvbWFrZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwgXCIke0RFUklWRURfU09VUkNFU19E SVJ9L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci8qLmhcIiBcIiR7REVSSVZFRF9TT1VSQ0VTX0RJ Un0vSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yXCIgXCIke0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9 L0phdmFTY3JpcHRDb3JlXCJcbiIpCiAKIHNldChKYXZhU2NyaXB0Q29yZV9PVVRQVVRfTkFNRSBK YXZhU2NyaXB0Q29yZSR7REVCVUdfU1VGRklYfSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL1NjcmlwdHMvbWFrZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmM5MmY2ZmRhODNmCi0tLSAvZGV2L251bGwKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1NjcmlwdHMvbWFrZS1mb3J3YXJkaW5nLWhlYWRlcnMu cGwKQEAgLTAsMCArMSwyNSBAQAordXNlIHN0cmljdDsKKwordXNlIEZpbGU6OkJhc2VuYW1lOwor CitteSAkc2VhcmNoUGF0aCA9IHNoaWZ0OworbXkgJGluY2x1ZGVQYXRoID0gc2hpZnQ7CitteSAk Zm9yd2FyZGluZ0RpciA9IHNoaWZ0OworCitteSBAaGVhZGVycyA9IGdsb2IoJHNlYXJjaFBhdGgp OworZm9yZWFjaChAaGVhZGVycykgeworICAgIG15ICRmaWxlID0gYmFzZW5hbWUoJF8pOworICAg IG15ICRmb3J3YXJkaW5nSGVhZGVyID0gJGZvcndhcmRpbmdEaXIuJy8nLiRmaWxlOworICAgIG15 ICRmaWxlQ29udGVudCA9ICIjaW5jbHVkZSBcIiRpbmNsdWRlUGF0aC8kZmlsZVwiXG4iOworICAg IGlmICgtZSAkZm9yd2FyZGluZ0hlYWRlcikgeworICAgICAgICBvcGVuIChIRUFERVIsICRmb3J3 YXJkaW5nSGVhZGVyKSBvciBkaWUoIlVuYWJsZSB0byBvcGVuICRmb3J3YXJkaW5nSGVhZGVyIik7 CisgICAgICAgIG15ICRleGlzdGluZ0NvbnRlbnQgPSA8SEVBREVSPjsKKyAgICAgICAgJGZpbGVD b250ZW50IGVxICRleGlzdGluZ0NvbnRlbnQgb3IgZGllKCIkZm9yd2FyZGluZ0hlYWRlciBhbHJl YWR5IGV4aXN0cyBhbmQgaGFzIGNvbnRlbnQ6XG4gICRleGlzdGluZ0NvbnRlbnRcbmV4cGVjdGVk OlxuICAkZmlsZUNvbnRlbnRcbiIpOworICAgIH0KKyAgICBlbHNlIHsKKyAgICAgICAgb3BlbihI RUFERVIsICc+JywgJGZvcndhcmRpbmdIZWFkZXIpOworICAgICAgICBwcmludCAiQ3JlYXRpbmcg Zm9yd2FyZGluZyBoZWFkZXIgJGZvcndhcmRpbmdIZWFkZXIgd2l0aCAjaW5jbHVkZSBcIiRpbmNs dWRlUGF0aC8kZmlsZVwiXG4iOworICAgICAgICBwcmludCBIRUFERVIgJGZpbGVDb250ZW50Owor ICAgIH0KKyAgICBjbG9zZShIRUFERVIpOworfQotLSAKMi4xNC4xLndpbmRvd3MuMQoK 327160 2017-11-17 03:00:10 -0800 2017-11-17 05:46:36 -0800 Patch set #2 checks if the perl script to create forwarding headers returns an error; if so it causes the batch script to return an error and the build stops. 0001-Win-forwarding-headers-should-not-be-copies.patch text/plain 4314 mark.salisbury RnJvbSBjYTlhZTA0MDhkMjkyOTc2ZjA1OTZhOWM1ZGU3YjBmMGU3OWMwMjQzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIFNhbGlzYnVyeSA8bWFyay5zYWxpc2J1cnlAaHAuY29t PgpEYXRlOiBGcmksIDE3IE5vdiAyMDE3IDA5OjU2OjQwICswOTAwClN1YmplY3Q6IFtQQVRDSF0g W1dpbl0gZm9yd2FyZGluZyBoZWFkZXJzIHNob3VsZCBub3QgYmUgY29waWVzCgpGb3J3YXJkaW5n IGhlYWRlcnMgY3JlYXRlZCBieSBKYXZhU2NyaXB0Q29yZSBhcmUgY3VycmVudGx5IGNvcGllcwpv ZiBmaWxlcywgbm90IGZpbGVzIHdoaWNoIGhhdmUgYSAjaW5jbHVkZSBwYXRoIHRvIHRoZSByZWFs IGhlYWRlciBmaWxlLgoKVGhlIHByb2JsZW0gd2l0aCB0aGlzIGFwcHJvYWNoIGlzIHRoYXQgaWYg dGhlIHNhbWUgZmlsZSBlbmRzIHVwIGJlaW5nCmluY2x1ZGVkIHR3aWNlLCBidXQgYXQgZGlmZmVy ZW50IHBhdGhzLCB0aGUgI3ByYWdtYSBvbmNlIGRvZXMgbm90aGluZwphbmQgY29tcGlsZSBlcnJv cnMgb2NjdXIgZnJvbSBtdWx0aXBseSBkZWZpbmVkIHN5bWJvbHMuCi0tLQogU291cmNlL0phdmFT Y3JpcHRDb3JlL1BsYXRmb3JtV2luLmNtYWtlICAgICAgICAgICAgfCAxMSArKysrKy0tLS0tCiAu Li4vU2NyaXB0cy9tYWtlLWZvcndhcmRpbmctaGVhZGVycy5wbCAgICAgICAgICAgICB8IDI1ICsr KysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMzEgaW5zZXJ0aW9ucygrKSwg NSBkZWxldGlvbnMoLSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBTb3VyY2UvSmF2YVNjcmlwdENvcmUv U2NyaXB0cy9tYWtlLWZvcndhcmRpbmctaGVhZGVycy5wbAoKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9QbGF0Zm9ybVdpbi5jbWFrZSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9Q bGF0Zm9ybVdpbi5jbWFrZQppbmRleCBiMzQ4ZWFlYWZiYS4uNmY2NDg0YjJjYTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9QbGF0Zm9ybVdpbi5jbWFrZQorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XaW4uY21ha2UKQEAgLTM0LDE1ICszNCwxNiBAQCBmaWxl KENPUFkKICkKIAogZmlsZShNQUtFX0RJUkVDVE9SWSAke0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9 L0phdmFTY3JpcHRDb3JlKQotCiBzZXQoSmF2YVNjcmlwdENvcmVfUFJFX0JVSUxEX0NPTU1BTkQg IiR7Q01BS0VfQklOQVJZX0RJUn0vRGVyaXZlZFNvdXJjZXMvSmF2YVNjcmlwdENvcmUvcHJlQnVp bGQuY21kIikKIGZpbGUoUkVNT1ZFICIke0phdmFTY3JpcHRDb3JlX1BSRV9CVUlMRF9DT01NQU5E fSIpCiBmb3JlYWNoIChfZGlyZWN0b3J5ICR7SmF2YVNjcmlwdENvcmVfRk9SV0FSRElOR19IRUFE RVJTX0RJUkVDVE9SSUVTfSkKLSAgICBmaWxlKEFQUEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QUkVf QlVJTERfQ09NTUFORH0iICJAeGNvcHkgL3kgL2QgL2YgXCIke0pBVkFTQ1JJUFRDT1JFX0RJUn0v JHtfZGlyZWN0b3J5fS8qLmhcIiBcIiR7Rk9SV0FSRElOR19IRUFERVJTX0RJUn0vSmF2YVNjcmlw dENvcmVcIiA+bnVsIDI+bnVsXG4iKQorICAgIGZpbGUoQVBQRU5EICIke0phdmFTY3JpcHRDb3Jl X1BSRV9CVUlMRF9DT01NQU5EfSIgInBlcmwgJHtKQVZBU0NSSVBUQ09SRV9ESVJ9L1NjcmlwdHMv bWFrZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwgXCIke0pBVkFTQ1JJUFRDT1JFX0RJUn0vJHtfZGly ZWN0b3J5fS8qLmhcIiBcIiR7SkFWQVNDUklQVENPUkVfRElSfS8ke19kaXJlY3Rvcnl9XCIgXCIk e0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9L0phdmFTY3JpcHRDb3JlXCJcbiIpCisgICAgZmlsZShB UFBFTkQgIiR7SmF2YVNjcmlwdENvcmVfUFJFX0JVSUxEX0NPTU1BTkR9IiAiaWYgJWVycm9ybGV2 ZWwlIE5FUSAwIGV4aXQgL2IgMVxuIikKIGVuZGZvcmVhY2ggKCkKLQogc2V0KEphdmFTY3JpcHRD b3JlX1BPU1RfQlVJTERfQ09NTUFORCAiJHtDTUFLRV9CSU5BUllfRElSfS9EZXJpdmVkU291cmNl cy9KYXZhU2NyaXB0Q29yZS9wb3N0QnVpbGQuY21kIikKLWZpbGUoV1JJVEUgIiR7SmF2YVNjcmlw dENvcmVfUE9TVF9CVUlMRF9DT01NQU5EfSIgIkB4Y29weSAveSAvZCAvZiBcIiR7REVSSVZFRF9T T1VSQ0VTX0RJUn0vSmF2YVNjcmlwdENvcmUvKi5oXCIgXCIke0ZPUldBUkRJTkdfSEVBREVSU19E SVJ9L0phdmFTY3JpcHRDb3JlXCIgPm51bCAyPm51bFxuIikKLWZpbGUoQVBQRU5EICIke0phdmFT Y3JpcHRDb3JlX1BPU1RfQlVJTERfQ09NTUFORH0iICJAeGNvcHkgL3kgL2QgL2YgXCIke0RFUklW RURfU09VUkNFU19ESVJ9L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci8qLmhcIiBcIiR7Rk9SV0FS RElOR19IRUFERVJTX0RJUn0vSmF2YVNjcmlwdENvcmVcIiA+bnVsIDI+bnVsXG4iKQorZmlsZShX UklURSAiJHtKYXZhU2NyaXB0Q29yZV9QT1NUX0JVSUxEX0NPTU1BTkR9IiAicGVybCAke0pBVkFT Q1JJUFRDT1JFX0RJUn0vU2NyaXB0cy9tYWtlLWZvcndhcmRpbmctaGVhZGVycy5wbCBcIiR7REVS SVZFRF9TT1VSQ0VTX0RJUn0vSmF2YVNjcmlwdENvcmUvKi5oXCIgXCIke0RFUklWRURfU09VUkNF U19ESVJ9L0phdmFTY3JpcHRDb3JlXCIgXCIke0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9L0phdmFT Y3JpcHRDb3JlXCJcbiIpCitmaWxlKEFQUEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QT1NUX0JVSUxE X0NPTU1BTkR9IiAiaWYgJWVycm9ybGV2ZWwlIE5FUSAwIGV4aXQgL2IgMVxuIikKK2ZpbGUoQVBQ RU5EICIke0phdmFTY3JpcHRDb3JlX1BPU1RfQlVJTERfQ09NTUFORH0iICJwZXJsICR7SkFWQVND UklQVENPUkVfRElSfS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsIFwiJHtERVJJ VkVEX1NPVVJDRVNfRElSfS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvKi5oXCIgXCIke0RFUklW RURfU09VUkNFU19ESVJ9L0phdmFTY3JpcHRDb3JlL2luc3BlY3RvclwiIFwiJHtGT1JXQVJESU5H X0hFQURFUlNfRElSfS9KYXZhU2NyaXB0Q29yZVwiXG4iKQorZmlsZShBUFBFTkQgIiR7SmF2YVNj cmlwdENvcmVfUE9TVF9CVUlMRF9DT01NQU5EfSIgImlmICVlcnJvcmxldmVsJSBORVEgMCBleGl0 IC9iIDFcbiIpCiAKIHNldChKYXZhU2NyaXB0Q29yZV9PVVRQVVRfTkFNRSBKYXZhU2NyaXB0Q29y ZSR7REVCVUdfU1VGRklYfSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3Jp cHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1Nj cmlwdHMvbWFrZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAuLmM5MmY2ZmRhODNmCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL1NjcmlwdHMvbWFrZS1mb3J3YXJkaW5nLWhlYWRlcnMucGwKQEAgLTAsMCAr MSwyNSBAQAordXNlIHN0cmljdDsKKwordXNlIEZpbGU6OkJhc2VuYW1lOworCitteSAkc2VhcmNo UGF0aCA9IHNoaWZ0OworbXkgJGluY2x1ZGVQYXRoID0gc2hpZnQ7CitteSAkZm9yd2FyZGluZ0Rp ciA9IHNoaWZ0OworCitteSBAaGVhZGVycyA9IGdsb2IoJHNlYXJjaFBhdGgpOworZm9yZWFjaChA aGVhZGVycykgeworICAgIG15ICRmaWxlID0gYmFzZW5hbWUoJF8pOworICAgIG15ICRmb3J3YXJk aW5nSGVhZGVyID0gJGZvcndhcmRpbmdEaXIuJy8nLiRmaWxlOworICAgIG15ICRmaWxlQ29udGVu dCA9ICIjaW5jbHVkZSBcIiRpbmNsdWRlUGF0aC8kZmlsZVwiXG4iOworICAgIGlmICgtZSAkZm9y d2FyZGluZ0hlYWRlcikgeworICAgICAgICBvcGVuIChIRUFERVIsICRmb3J3YXJkaW5nSGVhZGVy KSBvciBkaWUoIlVuYWJsZSB0byBvcGVuICRmb3J3YXJkaW5nSGVhZGVyIik7CisgICAgICAgIG15 ICRleGlzdGluZ0NvbnRlbnQgPSA8SEVBREVSPjsKKyAgICAgICAgJGZpbGVDb250ZW50IGVxICRl eGlzdGluZ0NvbnRlbnQgb3IgZGllKCIkZm9yd2FyZGluZ0hlYWRlciBhbHJlYWR5IGV4aXN0cyBh bmQgaGFzIGNvbnRlbnQ6XG4gICRleGlzdGluZ0NvbnRlbnRcbmV4cGVjdGVkOlxuICAkZmlsZUNv bnRlbnRcbiIpOworICAgIH0KKyAgICBlbHNlIHsKKyAgICAgICAgb3BlbihIRUFERVIsICc+Jywg JGZvcndhcmRpbmdIZWFkZXIpOworICAgICAgICBwcmludCAiQ3JlYXRpbmcgZm9yd2FyZGluZyBo ZWFkZXIgJGZvcndhcmRpbmdIZWFkZXIgd2l0aCAjaW5jbHVkZSBcIiRpbmNsdWRlUGF0aC8kZmls ZVwiXG4iOworICAgICAgICBwcmludCBIRUFERVIgJGZpbGVDb250ZW50OworICAgIH0KKyAgICBj bG9zZShIRUFERVIpOworfQotLSAKMi4xNC4xLndpbmRvd3MuMQoK 327163 2017-11-17 05:46:36 -0800 2017-11-17 06:06:59 -0800 Proposed fix 0001-Win-forwarding-headers-should-not-be-copies.patch text/plain 5803 mark.salisbury RnJvbSAxNDE0N2UxY2RhMDZiMzRkZDhlNzgwZTZiYjNmZGIxYTEyOGNmMTFiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIFNhbGlzYnVyeSA8bWFyay5zYWxpc2J1cnlAaHAuY29t PgpEYXRlOiBGcmksIDE3IE5vdiAyMDE3IDA5OjU2OjQwICswOTAwClN1YmplY3Q6IFtQQVRDSF0g W1dpbl0gZm9yd2FyZGluZyBoZWFkZXJzIHNob3VsZCBub3QgYmUgY29waWVzCgpGb3J3YXJkaW5n IGhlYWRlcnMgY3JlYXRlZCBieSBKYXZhU2NyaXB0Q29yZSBhcmUgY3VycmVudGx5IGNvcGllcwpv ZiBmaWxlcywgbm90IGZpbGVzIHdoaWNoIGhhdmUgYSAjaW5jbHVkZSBwYXRoIHRvIHRoZSByZWFs IGhlYWRlciBmaWxlLgoKVGhlIHByb2JsZW0gd2l0aCB0aGlzIGFwcHJvYWNoIGlzIHRoYXQgaWYg dGhlIHNhbWUgZmlsZSBlbmRzIHVwIGJlaW5nCmluY2x1ZGVkIHR3aWNlLCBidXQgYXQgZGlmZmVy ZW50IHBhdGhzLCB0aGUgI3ByYWdtYSBvbmNlIGRvZXMgbm90aGluZwphbmQgY29tcGlsZSBlcnJv cnMgb2NjdXIgZnJvbSBtdWx0aXBseSBkZWZpbmVkIHN5bWJvbHMuCi0tLQogU291cmNlL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgfCAxNyArKysrKysrKysrCiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XaW4uY21ha2UgICAgICAgICAgICB8IDExICsr KystLS0KIC4uLi9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsICAgICAgICAgICAg IHwgMzYgKysrKysrKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA1OSBpbnNlcnRp b25zKCspLCA1IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsCgpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cKaW5kZXggZTgxOGZmZWFiMWEuLjRlY2Y4MzUxODg0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNy0xMS0xNyAgTWFyayBTYWxpc2J1cnkgIDxt YXJrLnNhbGlzYnVyeUBocC5jb20+CisKKyAgICAgICAgW1dpbl0gZm9yd2FyZGluZyBoZWFkZXJz IHNob3VsZCBub3QgYmUgY29waWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzk4MTQKKworICAgICAgICBSZXZpZXdlZCBieSBLb25zdGFudGluIFRv a2FyZXYuCisKKyAgICAgICAgRm9yd2FyZGluZyBoZWFkZXJzIGNyZWF0ZWQgYnkgSmF2YVNjcmlw dENvcmUgYXJlIGN1cnJlbnRseSBjb3BpZXMKKyAgICAgICAgb2YgZmlsZXMsIG5vdCBmaWxlcyB3 aGljaCBoYXZlIGEgI2luY2x1ZGUgcGF0aCB0byB0aGUgcmVhbCBoZWFkZXIgZmlsZS4KKworICAg ICAgICBUaGUgcHJvYmxlbSB3aXRoIHRoaXMgYXBwcm9hY2ggaXMgdGhhdCBpZiB0aGUgc2FtZSBm aWxlIGVuZHMgdXAgYmVpbmcKKyAgICAgICAgaW5jbHVkZWQgdHdpY2UsIGJ1dCBhdCBkaWZmZXJl bnQgcGF0aHMsIHRoZSAjcHJhZ21hIG9uY2UgZG9lcyBub3RoaW5nCisgICAgICAgIGFuZCBjb21w aWxlIGVycm9ycyBvY2N1ciBmcm9tIG11bHRpcGx5IGRlZmluZWQgc3ltYm9scy4KKworICAgICAg ICAqIFBsYXRmb3JtV2luLmNtYWtlOgorICAgICAgICAqIFNjcmlwdHMvbWFrZS1mb3J3YXJkaW5n LWhlYWRlcnMucGw6IEFkZGVkLgorCiAyMDE3LTExLTE1ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRk YWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMjQ4NjMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XaW4uY21ha2UgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XaW4uY21ha2UKaW5kZXggYjM0OGVhZWFmYmEu LmZkMjcyZTQ5MDlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1X aW4uY21ha2UKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtV2luLmNtYWtlCkBA IC0zNCwxNSArMzQsMTYgQEAgZmlsZShDT1BZCiApCiAKIGZpbGUoTUFLRV9ESVJFQ1RPUlkgJHtG T1JXQVJESU5HX0hFQURFUlNfRElSfS9KYXZhU2NyaXB0Q29yZSkKLQogc2V0KEphdmFTY3JpcHRD b3JlX1BSRV9CVUlMRF9DT01NQU5EICIke0NNQUtFX0JJTkFSWV9ESVJ9L0Rlcml2ZWRTb3VyY2Vz L0phdmFTY3JpcHRDb3JlL3ByZUJ1aWxkLmNtZCIpCiBmaWxlKFJFTU9WRSAiJHtKYXZhU2NyaXB0 Q29yZV9QUkVfQlVJTERfQ09NTUFORH0iKQogZm9yZWFjaCAoX2RpcmVjdG9yeSAke0phdmFTY3Jp cHRDb3JlX0ZPUldBUkRJTkdfSEVBREVSU19ESVJFQ1RPUklFU30pCi0gICAgZmlsZShBUFBFTkQg IiR7SmF2YVNjcmlwdENvcmVfUFJFX0JVSUxEX0NPTU1BTkR9IiAiQHhjb3B5IC95IC9kIC9mIFwi JHtKQVZBU0NSSVBUQ09SRV9ESVJ9LyR7X2RpcmVjdG9yeX0vKi5oXCIgXCIke0ZPUldBUkRJTkdf SEVBREVSU19ESVJ9L0phdmFTY3JpcHRDb3JlXCIgPm51bCAyPm51bFxuIikKKyAgICBmaWxlKEFQ UEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QUkVfQlVJTERfQ09NTUFORH0iICJwZXJsICR7SkFWQVND UklQVENPUkVfRElSfS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsIC0tc2VhcmNo LXBhdGg9XCIke0pBVkFTQ1JJUFRDT1JFX0RJUn0vJHtfZGlyZWN0b3J5fS8qLmhcIiAtLWluY2x1 ZGUtcGF0aD1cIiR7SkFWQVNDUklQVENPUkVfRElSfS8ke19kaXJlY3Rvcnl9XCIgLS1mb3J3YXJk aW5nLWRpcj1cIiR7Rk9SV0FSRElOR19IRUFERVJTX0RJUn0vSmF2YVNjcmlwdENvcmVcIlxuIikK KyAgICBmaWxlKEFQUEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QUkVfQlVJTERfQ09NTUFORH0iICJp ZiAlZXJyb3JsZXZlbCUgTkVRIDAgZXhpdCAvYiAxXG4iKQogZW5kZm9yZWFjaCAoKQotCiBzZXQo SmF2YVNjcmlwdENvcmVfUE9TVF9CVUlMRF9DT01NQU5EICIke0NNQUtFX0JJTkFSWV9ESVJ9L0Rl cml2ZWRTb3VyY2VzL0phdmFTY3JpcHRDb3JlL3Bvc3RCdWlsZC5jbWQiKQotZmlsZShXUklURSAi JHtKYXZhU2NyaXB0Q29yZV9QT1NUX0JVSUxEX0NPTU1BTkR9IiAiQHhjb3B5IC95IC9kIC9mIFwi JHtERVJJVkVEX1NPVVJDRVNfRElSfS9KYXZhU2NyaXB0Q29yZS8qLmhcIiBcIiR7Rk9SV0FSRElO R19IRUFERVJTX0RJUn0vSmF2YVNjcmlwdENvcmVcIiA+bnVsIDI+bnVsXG4iKQotZmlsZShBUFBF TkQgIiR7SmF2YVNjcmlwdENvcmVfUE9TVF9CVUlMRF9DT01NQU5EfSIgIkB4Y29weSAveSAvZCAv ZiBcIiR7REVSSVZFRF9TT1VSQ0VTX0RJUn0vSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yLyouaFwi IFwiJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfS9KYXZhU2NyaXB0Q29yZVwiID5udWwgMj5udWxc biIpCitmaWxlKFdSSVRFICIke0phdmFTY3JpcHRDb3JlX1BPU1RfQlVJTERfQ09NTUFORH0iICJw ZXJsICR7SkFWQVNDUklQVENPUkVfRElSfS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJz LnBsIC0tc2VhcmNoLXBhdGg9XCIke0RFUklWRURfU09VUkNFU19ESVJ9L0phdmFTY3JpcHRDb3Jl LyouaFwiIC0taW5jbHVkZS1wYXRoPVwiJHtERVJJVkVEX1NPVVJDRVNfRElSfS9KYXZhU2NyaXB0 Q29yZVwiIC0tZm9yd2FyZGluZy1kaXI9XCIke0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9L0phdmFT Y3JpcHRDb3JlXCJcbiIpCitmaWxlKEFQUEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QT1NUX0JVSUxE X0NPTU1BTkR9IiAiaWYgJWVycm9ybGV2ZWwlIE5FUSAwIGV4aXQgL2IgMVxuIikKK2ZpbGUoQVBQ RU5EICIke0phdmFTY3JpcHRDb3JlX1BPU1RfQlVJTERfQ09NTUFORH0iICJwZXJsICR7SkFWQVND UklQVENPUkVfRElSfS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsIC0tc2VhcmNo LXBhdGg9XCIke0RFUklWRURfU09VUkNFU19ESVJ9L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci8q LmhcIiAtLWluY2x1ZGUtcGF0aD1cIiR7REVSSVZFRF9TT1VSQ0VTX0RJUn0vSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yXCIgLS1mb3J3YXJkaW5nLWRpcj1cIiR7Rk9SV0FSRElOR19IRUFERVJTX0RJ Un0vSmF2YVNjcmlwdENvcmVcIlxuIikKK2ZpbGUoQVBQRU5EICIke0phdmFTY3JpcHRDb3JlX1BP U1RfQlVJTERfQ09NTUFORH0iICJpZiAlZXJyb3JsZXZlbCUgTkVRIDAgZXhpdCAvYiAxXG4iKQog CiBzZXQoSmF2YVNjcmlwdENvcmVfT1VUUFVUX05BTUUgSmF2YVNjcmlwdENvcmUke0RFQlVHX1NV RkZJWH0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU2NyaXB0cy9tYWtlLWZv cndhcmRpbmctaGVhZGVycy5wbCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL21ha2Ut Zm9yd2FyZGluZy1oZWFkZXJzLnBsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwLi5hZDc4MDcxNzZlMgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsCkBAIC0wLDAgKzEsMzYgQEAKK3Vz ZSBzdHJpY3Q7Cit1c2Ugd2FybmluZ3M7CisKK3VzZSBGaWxlOjpCYXNlbmFtZTsKK3VzZSBGaWxl OjpTcGVjOwordXNlIEdldG9wdDo6TG9uZzsKKworbXkgJHNlYXJjaFBhdGg7CitteSAkaW5jbHVk ZVBhdGg7CitteSAkZm9yd2FyZGluZ0RpcjsKKworbXkgJW9wdGlvbnMgPSAoCisgICAgJ3NlYXJj aC1wYXRoPXMnID0+IFwkc2VhcmNoUGF0aCwKKyAgICAnaW5jbHVkZS1wYXRoPXMnID0+IFwkaW5j bHVkZVBhdGgsCisgICAgJ2ZvcndhcmRpbmctZGlyPXMnID0+IFwkZm9yd2FyZGluZ0RpciwKKyk7 CitHZXRPcHRpb25zICglb3B0aW9ucyk7CisKK215IEBoZWFkZXJzID0gZ2xvYigkc2VhcmNoUGF0 aCk7Citmb3JlYWNoIG15ICRoZWFkZXIgKEBoZWFkZXJzKSB7CisgICAgbXkgJGZpbGUgPSBiYXNl bmFtZSgkaGVhZGVyKTsKKyAgICBteSAkZm9yd2FyZGluZ0hlYWRlciA9IEZpbGU6OlNwZWMtPmpv aW4oJGZvcndhcmRpbmdEaXIsICRmaWxlKTsKKyAgICBteSAkZmlsZUNvbnRlbnQgPSAiI2luY2x1 ZGUgXCIkaW5jbHVkZVBhdGgvJGZpbGVcIlxuIjsKKyAgICBpZiAoLWUgJGZvcndhcmRpbmdIZWFk ZXIpIHsKKyAgICAgICAgb3BlbiAobXkgJGZoLCAnPCcsICRmb3J3YXJkaW5nSGVhZGVyKSBvciBk aWUoIlVuYWJsZSB0byBvcGVuICRmb3J3YXJkaW5nSGVhZGVyICgkISkiKTsKKyAgICAgICAgbXkg JGV4aXN0aW5nQ29udGVudCA9IDwkZmg+OworICAgICAgICBjbG9zZSgkZmgpOworICAgICAgICAk ZmlsZUNvbnRlbnQgZXEgJGV4aXN0aW5nQ29udGVudCBvciBkaWUoIiRmb3J3YXJkaW5nSGVhZGVy IGFscmVhZHkgZXhpc3RzIGFuZCBoYXMgY29udGVudDpcbiAgJGV4aXN0aW5nQ29udGVudFxuZXhw ZWN0ZWQ6XG4gICRmaWxlQ29udGVudFxuIik7CisgICAgfQorICAgIGVsc2UgeworICAgICAgICBv cGVuKG15ICRmaCwgJz4nLCAkZm9yd2FyZGluZ0hlYWRlcik7CisgICAgICAgIHByaW50ICJDcmVh dGluZyBmb3J3YXJkaW5nIGhlYWRlciAkZm9yd2FyZGluZ0hlYWRlciB3aXRoICNpbmNsdWRlIFwi JGluY2x1ZGVQYXRoLyRmaWxlXCJcbiI7CisgICAgICAgIHByaW50ICRmaCAkZmlsZUNvbnRlbnQ7 CisgICAgICAgIGNsb3NlKCRmaCkgb3IgZGllKCJGYWlsZWQgdG8gY2xvc2UgJGZvcndhcmRpbmdI ZWFkZXIgKCQhKSIpOworICAgIH0KK30KLS0gCjIuMTQuMS53aW5kb3dzLjEKCg== 327166 2017-11-17 06:06:59 -0800 2017-11-17 17:28:39 -0800 Proposed fix 0001-Win-forwarding-headers-should-not-be-copies.patch text/plain 5801 mark.salisbury RnJvbSA2NDljOWQ4MDhkNDhkMGEzZTNiN2Y0NjFiMDZjMWY3MThlNDA1Y2ZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJrIFNhbGlzYnVyeSA8bWFyay5zYWxpc2J1cnlAaHAuY29t PgpEYXRlOiBGcmksIDE3IE5vdiAyMDE3IDA5OjU2OjQwICswOTAwClN1YmplY3Q6IFtQQVRDSF0g W1dpbl0gZm9yd2FyZGluZyBoZWFkZXJzIHNob3VsZCBub3QgYmUgY29waWVzCgpGb3J3YXJkaW5n IGhlYWRlcnMgY3JlYXRlZCBieSBKYXZhU2NyaXB0Q29yZSBhcmUgY3VycmVudGx5IGNvcGllcwpv ZiBmaWxlcywgbm90IGZpbGVzIHdoaWNoIGhhdmUgYSAjaW5jbHVkZSBwYXRoIHRvIHRoZSByZWFs IGhlYWRlciBmaWxlLgoKVGhlIHByb2JsZW0gd2l0aCB0aGlzIGFwcHJvYWNoIGlzIHRoYXQgaWYg dGhlIHNhbWUgZmlsZSBlbmRzIHVwIGJlaW5nCmluY2x1ZGVkIHR3aWNlLCBidXQgYXQgZGlmZmVy ZW50IHBhdGhzLCB0aGUgI3ByYWdtYSBvbmNlIGRvZXMgbm90aGluZwphbmQgY29tcGlsZSBlcnJv cnMgb2NjdXIgZnJvbSBtdWx0aXBseSBkZWZpbmVkIHN5bWJvbHMuCi0tLQogU291cmNlL0phdmFT Y3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgfCAxNyArKysrKysrKysrCiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XaW4uY21ha2UgICAgICAgICAgICB8IDExICsr KystLS0KIC4uLi9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsICAgICAgICAgICAg IHwgMzYgKysrKysrKysrKysrKysrKysrKysrKwogMyBmaWxlcyBjaGFuZ2VkLCA1OSBpbnNlcnRp b25zKCspLCA1IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsCgpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cKaW5kZXggZTgxOGZmZWFiMWEuLjRlY2Y4MzUxODg0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxNy0xMS0xNyAgTWFyayBTYWxpc2J1cnkgIDxt YXJrLnNhbGlzYnVyeUBocC5jb20+CisKKyAgICAgICAgW1dpbl0gZm9yd2FyZGluZyBoZWFkZXJz IHNob3VsZCBub3QgYmUgY29waWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzk4MTQKKworICAgICAgICBSZXZpZXdlZCBieSBLb25zdGFudGluIFRv a2FyZXYuCisKKyAgICAgICAgRm9yd2FyZGluZyBoZWFkZXJzIGNyZWF0ZWQgYnkgSmF2YVNjcmlw dENvcmUgYXJlIGN1cnJlbnRseSBjb3BpZXMKKyAgICAgICAgb2YgZmlsZXMsIG5vdCBmaWxlcyB3 aGljaCBoYXZlIGEgI2luY2x1ZGUgcGF0aCB0byB0aGUgcmVhbCBoZWFkZXIgZmlsZS4KKworICAg ICAgICBUaGUgcHJvYmxlbSB3aXRoIHRoaXMgYXBwcm9hY2ggaXMgdGhhdCBpZiB0aGUgc2FtZSBm aWxlIGVuZHMgdXAgYmVpbmcKKyAgICAgICAgaW5jbHVkZWQgdHdpY2UsIGJ1dCBhdCBkaWZmZXJl bnQgcGF0aHMsIHRoZSAjcHJhZ21hIG9uY2UgZG9lcyBub3RoaW5nCisgICAgICAgIGFuZCBjb21w aWxlIGVycm9ycyBvY2N1ciBmcm9tIG11bHRpcGx5IGRlZmluZWQgc3ltYm9scy4KKworICAgICAg ICAqIFBsYXRmb3JtV2luLmNtYWtlOgorICAgICAgICAqIFNjcmlwdHMvbWFrZS1mb3J3YXJkaW5n LWhlYWRlcnMucGw6IEFkZGVkLgorCiAyMDE3LTExLTE1ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRk YWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMjQ4NjMu CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XaW4uY21ha2UgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1XaW4uY21ha2UKaW5kZXggYjM0OGVhZWFmYmEu LmZkMjcyZTQ5MDlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvUGxhdGZvcm1X aW4uY21ha2UKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL1BsYXRmb3JtV2luLmNtYWtlCkBA IC0zNCwxNSArMzQsMTYgQEAgZmlsZShDT1BZCiApCiAKIGZpbGUoTUFLRV9ESVJFQ1RPUlkgJHtG T1JXQVJESU5HX0hFQURFUlNfRElSfS9KYXZhU2NyaXB0Q29yZSkKLQogc2V0KEphdmFTY3JpcHRD b3JlX1BSRV9CVUlMRF9DT01NQU5EICIke0NNQUtFX0JJTkFSWV9ESVJ9L0Rlcml2ZWRTb3VyY2Vz L0phdmFTY3JpcHRDb3JlL3ByZUJ1aWxkLmNtZCIpCiBmaWxlKFJFTU9WRSAiJHtKYXZhU2NyaXB0 Q29yZV9QUkVfQlVJTERfQ09NTUFORH0iKQogZm9yZWFjaCAoX2RpcmVjdG9yeSAke0phdmFTY3Jp cHRDb3JlX0ZPUldBUkRJTkdfSEVBREVSU19ESVJFQ1RPUklFU30pCi0gICAgZmlsZShBUFBFTkQg IiR7SmF2YVNjcmlwdENvcmVfUFJFX0JVSUxEX0NPTU1BTkR9IiAiQHhjb3B5IC95IC9kIC9mIFwi JHtKQVZBU0NSSVBUQ09SRV9ESVJ9LyR7X2RpcmVjdG9yeX0vKi5oXCIgXCIke0ZPUldBUkRJTkdf SEVBREVSU19ESVJ9L0phdmFTY3JpcHRDb3JlXCIgPm51bCAyPm51bFxuIikKKyAgICBmaWxlKEFQ UEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QUkVfQlVJTERfQ09NTUFORH0iICJwZXJsICR7SkFWQVND UklQVENPUkVfRElSfS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsIC0tc2VhcmNo LXBhdGg9XCIke0pBVkFTQ1JJUFRDT1JFX0RJUn0vJHtfZGlyZWN0b3J5fS8qLmhcIiAtLWluY2x1 ZGUtcGF0aD1cIiR7SkFWQVNDUklQVENPUkVfRElSfS8ke19kaXJlY3Rvcnl9XCIgLS1mb3J3YXJk aW5nLWRpcj1cIiR7Rk9SV0FSRElOR19IRUFERVJTX0RJUn0vSmF2YVNjcmlwdENvcmVcIlxuIikK KyAgICBmaWxlKEFQUEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QUkVfQlVJTERfQ09NTUFORH0iICJp ZiAlZXJyb3JsZXZlbCUgTkVRIDAgZXhpdCAvYiAxXG4iKQogZW5kZm9yZWFjaCAoKQotCiBzZXQo SmF2YVNjcmlwdENvcmVfUE9TVF9CVUlMRF9DT01NQU5EICIke0NNQUtFX0JJTkFSWV9ESVJ9L0Rl cml2ZWRTb3VyY2VzL0phdmFTY3JpcHRDb3JlL3Bvc3RCdWlsZC5jbWQiKQotZmlsZShXUklURSAi JHtKYXZhU2NyaXB0Q29yZV9QT1NUX0JVSUxEX0NPTU1BTkR9IiAiQHhjb3B5IC95IC9kIC9mIFwi JHtERVJJVkVEX1NPVVJDRVNfRElSfS9KYXZhU2NyaXB0Q29yZS8qLmhcIiBcIiR7Rk9SV0FSRElO R19IRUFERVJTX0RJUn0vSmF2YVNjcmlwdENvcmVcIiA+bnVsIDI+bnVsXG4iKQotZmlsZShBUFBF TkQgIiR7SmF2YVNjcmlwdENvcmVfUE9TVF9CVUlMRF9DT01NQU5EfSIgIkB4Y29weSAveSAvZCAv ZiBcIiR7REVSSVZFRF9TT1VSQ0VTX0RJUn0vSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yLyouaFwi IFwiJHtGT1JXQVJESU5HX0hFQURFUlNfRElSfS9KYXZhU2NyaXB0Q29yZVwiID5udWwgMj5udWxc biIpCitmaWxlKFdSSVRFICIke0phdmFTY3JpcHRDb3JlX1BPU1RfQlVJTERfQ09NTUFORH0iICJw ZXJsICR7SkFWQVNDUklQVENPUkVfRElSfS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJz LnBsIC0tc2VhcmNoLXBhdGg9XCIke0RFUklWRURfU09VUkNFU19ESVJ9L0phdmFTY3JpcHRDb3Jl LyouaFwiIC0taW5jbHVkZS1wYXRoPVwiJHtERVJJVkVEX1NPVVJDRVNfRElSfS9KYXZhU2NyaXB0 Q29yZVwiIC0tZm9yd2FyZGluZy1kaXI9XCIke0ZPUldBUkRJTkdfSEVBREVSU19ESVJ9L0phdmFT Y3JpcHRDb3JlXCJcbiIpCitmaWxlKEFQUEVORCAiJHtKYXZhU2NyaXB0Q29yZV9QT1NUX0JVSUxE X0NPTU1BTkR9IiAiaWYgJWVycm9ybGV2ZWwlIE5FUSAwIGV4aXQgL2IgMVxuIikKK2ZpbGUoQVBQ RU5EICIke0phdmFTY3JpcHRDb3JlX1BPU1RfQlVJTERfQ09NTUFORH0iICJwZXJsICR7SkFWQVND UklQVENPUkVfRElSfS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsIC0tc2VhcmNo LXBhdGg9XCIke0RFUklWRURfU09VUkNFU19ESVJ9L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci8q LmhcIiAtLWluY2x1ZGUtcGF0aD1cIiR7REVSSVZFRF9TT1VSQ0VTX0RJUn0vSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yXCIgLS1mb3J3YXJkaW5nLWRpcj1cIiR7Rk9SV0FSRElOR19IRUFERVJTX0RJ Un0vSmF2YVNjcmlwdENvcmVcIlxuIikKK2ZpbGUoQVBQRU5EICIke0phdmFTY3JpcHRDb3JlX1BP U1RfQlVJTERfQ09NTUFORH0iICJpZiAlZXJyb3JsZXZlbCUgTkVRIDAgZXhpdCAvYiAxXG4iKQog CiBzZXQoSmF2YVNjcmlwdENvcmVfT1VUUFVUX05BTUUgSmF2YVNjcmlwdENvcmUke0RFQlVHX1NV RkZJWH0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU2NyaXB0cy9tYWtlLWZv cndhcmRpbmctaGVhZGVycy5wbCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL21ha2Ut Zm9yd2FyZGluZy1oZWFkZXJzLnBsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwLi45NTFmZmI5YjhkYQotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9TY3JpcHRzL21ha2UtZm9yd2FyZGluZy1oZWFkZXJzLnBsCkBAIC0wLDAgKzEsMzYgQEAKK3Vz ZSBzdHJpY3Q7Cit1c2Ugd2FybmluZ3M7CisKK3VzZSBGaWxlOjpCYXNlbmFtZTsKK3VzZSBGaWxl OjpTcGVjOwordXNlIEdldG9wdDo6TG9uZzsKKworbXkgJHNlYXJjaFBhdGg7CitteSAkaW5jbHVk ZVBhdGg7CitteSAkZm9yd2FyZGluZ0RpcjsKKworbXkgJW9wdGlvbnMgPSAoCisgICAgJ3NlYXJj aC1wYXRoPXMnID0+IFwkc2VhcmNoUGF0aCwKKyAgICAnaW5jbHVkZS1wYXRoPXMnID0+IFwkaW5j bHVkZVBhdGgsCisgICAgJ2ZvcndhcmRpbmctZGlyPXMnID0+IFwkZm9yd2FyZGluZ0RpciwKKyk7 CitHZXRPcHRpb25zICglb3B0aW9ucyk7CisKK215IEBoZWFkZXJzID0gZ2xvYigkc2VhcmNoUGF0 aCk7Citmb3JlYWNoIG15ICRoZWFkZXIgKEBoZWFkZXJzKSB7CisgICAgbXkgJGZpbGUgPSBiYXNl bmFtZSgkaGVhZGVyKTsKKyAgICBteSAkZm9yd2FyZGluZ0hlYWRlciA9IEZpbGU6OlNwZWMtPmpv aW4oJGZvcndhcmRpbmdEaXIsICRmaWxlKTsKKyAgICBteSAkZmlsZUNvbnRlbnQgPSAiI2luY2x1 ZGUgXCIkaW5jbHVkZVBhdGgvJGZpbGVcIiI7CisgICAgaWYgKC1lICRmb3J3YXJkaW5nSGVhZGVy KSB7CisgICAgICAgIG9wZW4gKG15ICRmaCwgJzwnLCAkZm9yd2FyZGluZ0hlYWRlcikgb3IgZGll KCJVbmFibGUgdG8gb3BlbiAkZm9yd2FyZGluZ0hlYWRlciAoJCEpIik7CisgICAgICAgIG15ICRl eGlzdGluZ0NvbnRlbnQgPSA8JGZoPjsKKyAgICAgICAgY2xvc2UoJGZoKTsKKyAgICAgICAgJGZp bGVDb250ZW50IGVxICRleGlzdGluZ0NvbnRlbnQgb3IgZGllKCIkZm9yd2FyZGluZ0hlYWRlciBh bHJlYWR5IGV4aXN0cyBhbmQgaGFzIGNvbnRlbnQ6XG4gICRleGlzdGluZ0NvbnRlbnRcbmV4cGVj dGVkOlxuICAkZmlsZUNvbnRlbnRcbiIpOworICAgIH0KKyAgICBlbHNlIHsKKyAgICAgICAgb3Bl bihteSAkZmgsICc+JywgJGZvcndhcmRpbmdIZWFkZXIpOworICAgICAgICBwcmludCAiQ3JlYXRp bmcgZm9yd2FyZGluZyBoZWFkZXIgJGZvcndhcmRpbmdIZWFkZXIgd2l0aCAjaW5jbHVkZSBcIiRp bmNsdWRlUGF0aC8kZmlsZVwiXG4iOworICAgICAgICBwcmludCAkZmggJGZpbGVDb250ZW50Owor ICAgICAgICBjbG9zZSgkZmgpIG9yIGRpZSgiRmFpbGVkIHRvIGNsb3NlICRmb3J3YXJkaW5nSGVh ZGVyICgkISkiKTsKKyAgICB9Cit9Ci0tIAoyLjE0LjEud2luZG93cy4xCgo=