Summary: | Add user defaults to override system proxy settings for NetworkProcess on Mac | ||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Kiran Muppala <cmuppala> | ||||||||||||||||||||||||
Component: | WebKit2 | Assignee: | Kiran Muppala <cmuppala> | ||||||||||||||||||||||||
Status: | RESOLVED FIXED | ||||||||||||||||||||||||||
Severity: | Normal | CC: | ap, beidson, dbates, mitz, rniwa, slewis, thorton, webkit.review.bot | ||||||||||||||||||||||||
Priority: | P2 | Keywords: | InRadar | ||||||||||||||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||||||||||||||||
Hardware: | Unspecified | ||||||||||||||||||||||||||
OS: | Unspecified | ||||||||||||||||||||||||||
Attachments: |
|
Description
Kiran Muppala
2012-12-05 17:57:13 PST
Created attachment 178093 [details]
WIP Patch
Created attachment 178097 [details]
WIP Patch
(In reply to comment #3) > Created an attachment (id=178097) [details] > Patch Removed unnecessary import of <CFNetwork/CFProxySupportPriv.h> from Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm, based on review feedback from Stephanie Lewis. Created attachment 178108 [details]
Patch
(In reply to comment #5) > Created an attachment (id=178108) [details] > Patch Updated WebKitSystemInterface.h, libWebKitSystemInterfaceLion.a and libWebKitSystemInterfaceMountainLion.a. Created attachment 178115 [details]
WIP Patch
(In reply to comment #7) > Created an attachment (id=178115) [details] > Patch Fixed merge conflict. Created attachment 178137 [details]
WIP Patch
(In reply to comment #9) > Created an attachment (id=178137) [details] > Patch Rolled out the WebKitSytemInterface changes, since it should have been done after this bug was reviewed. Hence, also removed the WebKitLibraries part of this patch. Will re-include after review. Also, fixed style issues with missing spaces in NetworkProcessMac.mm. No, functional changes. Comment on attachment 178137 [details] WIP Patch Attachment 178137 [details] did not pass mac-ews (mac): Output: http://queues.webkit.org/results/15186277 Created attachment 179841 [details]
Patch
(In reply to comment #12) > Created an attachment (id=179841) [details] > Patch Updated patch to resolve merge conflicts and included WebKitSystemInterface changes too. Created attachment 179851 [details]
Patch
(In reply to comment #14) > Created an attachment (id=179851) [details] > Patch Fixed merge conflict again. No other changes. Created attachment 181801 [details]
WIP Patch
(In reply to comment #16) > Created an attachment (id=181801) [details] > Patch Fixed merge conflict. Uploading for EWS analysis. Created attachment 181820 [details]
Patch
(In reply to comment #18) > Created an attachment (id=181820) [details] > Patch Updated WKSI libraries. I would r+ this, but the new review policy is moving into place so we need to find one of the wk2 owners to look it over. Moved WKSI portion to https://bugs.webkit.org/show_bug.cgi?id=106410, thanks to Stephanie for giving me this idea to avoid rolling out the internal commit yet again. Created attachment 181833 [details]
Patch
(In reply to comment #22) > Created an attachment (id=181833) [details] > Patch Removed the WKSI portion. No other change. Comment on attachment 181833 [details] Patch Attachment 181833 [details] did not pass mac-ews (mac): Output: http://queues.webkit.org/results/15760346 (In reply to comment #24) > (From update of attachment 181833 [details]) > Attachment 181833 [details] did not pass mac-ews (mac): > Output: http://queues.webkit.org/results/15760346 D'oh, of course it will fail because the WKSI portion hasn't landed yet. Created attachment 181840 [details]
Patch
(In reply to comment #26) > Created an attachment (id=181840) [details] > Patch Resubmitting patch for EWS, since WKSI part has landed. Comment on attachment 181840 [details] Patch Clearing flags on attachment: 181840 Committed r139241: <http://trac.webkit.org/changeset/139241> All reviewed patches have been landed. Closing bug. (In reply to comment #28) > (From update of attachment 181840 [details]) > Clearing flags on attachment: 181840 > > Committed r139241: <http://trac.webkit.org/changeset/139241> Fixed the Mac WebKit2 build when building without the network process by adding a ENABLE(NETWORK_PROCESS) guard around the constants WebKit2HTTPProxyDefaultsKey and WebKit2HTTPSProxyDefaultsKey. Committed this fix in r156776, <http://trac.webkit.org/changeset/156776>. |