Bug 104197 – Add user defaults to override system proxy settings for NetworkProcess on Mac

• Component: WebKit2
• Status: RESOLVED FIXED

[Kiran Muppala]

For internal testing and debugging, it is useful to have a defaults write to set the HTTP and HTTPS proxy specific to a WebKit2 client Application and not affect the system proxy settings on Mac.

This is related to https://bugs.webkit.org/show_bug.cgi?id=96456, which was originally intended for WebProcess but later rejected since InjectedBundle can be used for the same effect.  This bug is necessary since, Network Process does not use a InjectedBundle.

[Kiran Muppala]

<rdar://problem/12790572>

[Kiran Muppala]

Created attachment 178093 [details]
WIP Patch

[Kiran Muppala]

Created attachment 178097 [details]
WIP Patch

[Kiran Muppala]

(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.

[Kiran Muppala]

Created attachment 178108 [details]
Patch

[Kiran Muppala]

(In reply to comment #5)
> Created an attachment (id=178108) [details]
> Patch

Updated WebKitSystemInterface.h, libWebKitSystemInterfaceLion.a and libWebKitSystemInterfaceMountainLion.a.

[Kiran Muppala]

Created attachment 178115 [details]
WIP Patch

[Kiran Muppala]

(In reply to comment #7)
> Created an attachment (id=178115) [details]
> Patch

Fixed merge conflict.

[Kiran Muppala]

Created attachment 178137 [details]
WIP Patch

[Kiran Muppala]

(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.

[Build Bot]

Comment on attachment 178137 [details]
WIP Patch

Attachment 178137 [details] did not pass mac-ews (mac):
Output: http://queues.webkit.org/results/15186277

[Kiran Muppala]

Created attachment 179841 [details]
Patch

[Kiran Muppala]

(In reply to comment #12)
> Created an attachment (id=179841) [details]
> Patch

Updated patch to resolve merge conflicts and included WebKitSystemInterface changes too.

[Kiran Muppala]

Created attachment 179851 [details]
Patch

[Kiran Muppala]

(In reply to comment #14)
> Created an attachment (id=179851) [details]
> Patch

Fixed merge conflict again.  No other changes.

[Kiran Muppala]

Created attachment 181801 [details]
WIP Patch

[Kiran Muppala]

(In reply to comment #16)
> Created an attachment (id=181801) [details]
> Patch

Fixed merge conflict.  Uploading for EWS analysis.

[Kiran Muppala]

Created attachment 181820 [details]
Patch

[Kiran Muppala]

(In reply to comment #18)
> Created an attachment (id=181820) [details]
> Patch

Updated WKSI libraries.

[Stephanie Lewis]

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.

[Kiran Muppala]

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.

[Kiran Muppala]

Created attachment 181833 [details]
Patch

[Kiran Muppala]

(In reply to comment #22)
> Created an attachment (id=181833) [details]
> Patch

Removed the WKSI portion.  No other change.

[Build Bot]

Comment on attachment 181833 [details]
Patch

Attachment 181833 [details] did not pass mac-ews (mac):
Output: http://queues.webkit.org/results/15760346

[Kiran Muppala]

(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.

[Kiran Muppala]

Created attachment 181840 [details]
Patch

[Kiran Muppala]

(In reply to comment #26)
> Created an attachment (id=181840) [details]
> Patch

Resubmitting patch for EWS, since WKSI part has landed.

[WebKit Review Bot]

Comment on attachment 181840 [details]
Patch

Clearing flags on attachment: 181840

Committed r139241: <http://trac.webkit.org/changeset/139241>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[Daniel Bates]

(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>.