diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-06-01 21:58:35 +0000 |
| commit | c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810 (patch) | |
| tree | c7672903a2030d37f861b12900165a015f49d10a /netwerk/protocol/http/moz.build | |
| parent | 451509e2c0188a4164d4b3d1d9f5839ed1e95246 (diff) | |
| parent | 744b044935f7d1d67fbe0df42d898efcbdd00536 (diff) | |
| download | UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.gz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.lz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.tar.xz UXP-c6ca4380e9e5e95df9de02daf8bfb9a6ebc22810.zip | |
Merge remote-tracking branch 'origin/redwood' into release
Diffstat (limited to 'netwerk/protocol/http/moz.build')
| -rw-r--r-- | netwerk/protocol/http/moz.build | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index a1b57876b..8e3c51010 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -43,18 +43,11 @@ EXPORTS.mozilla.net += [ 'TimingStruct.h', ] -# ASpdySession.cpp and nsHttpAuthCache cannot be built in unified mode because -# they use plarena.h. SOURCES += [ - 'AlternateServices.cpp', - 'ASpdySession.cpp', - 'nsHttpAuthCache.cpp', - 'nsHttpChannelAuthProvider.cpp', # redefines GetAuthType -] - -UNIFIED_SOURCES += [ 'AltDataOutputStreamChild.cpp', 'AltDataOutputStreamParent.cpp', + 'AlternateServices.cpp', + 'ASpdySession.cpp', 'CacheControlParser.cpp', 'ConnectionDiagnostics.cpp', 'Http2Compression.cpp', @@ -70,14 +63,17 @@ UNIFIED_SOURCES += [ 'nsCORSListenerProxy.cpp', 'nsHttp.cpp', 'nsHttpActivityDistributor.cpp', + 'nsHttpAuthCache.cpp', 'nsHttpAuthManager.cpp', 'nsHttpBasicAuth.cpp', 'nsHttpChannel.cpp', + 'nsHttpChannelAuthProvider.cpp', 'nsHttpChunkedDecoder.cpp', 'nsHttpConnection.cpp', 'nsHttpConnectionInfo.cpp', 'nsHttpConnectionMgr.cpp', 'nsHttpDigestAuth.cpp', + 'nsHttpHandler.cpp', 'nsHttpHeaderArray.cpp', 'nsHttpNTLMAuth.cpp', 'nsHttpPipeline.cpp', @@ -89,11 +85,6 @@ UNIFIED_SOURCES += [ 'TunnelUtils.cpp', ] -# These files cannot be built in unified mode because of OS X headers. -SOURCES += [ - 'nsHttpHandler.cpp', -] - IPDL_SOURCES += [ 'PAltDataOutputStream.ipdl', 'PHttpChannel.ipdl', |