nsSocketTransport2.h (palemoon-29.4.1-source.tar.xz) | : | nsSocketTransport2.h (palemoon-29.4.2-source.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 309 | skipping to change at line 309 | |||
// The origin attributes are used to create sockets. The first party domain | // The origin attributes are used to create sockets. The first party domain | |||
// will eventually be used to isolate OCSP cache and is only non-empty when | // will eventually be used to isolate OCSP cache and is only non-empty when | |||
// "privacy.firstparty.isolate" is enabled. Setting this is the only way to | // "privacy.firstparty.isolate" is enabled. Setting this is the only way to | |||
// carry origin attributes down to NSPR layers which are final consumers. | // carry origin attributes down to NSPR layers which are final consumers. | |||
// It must be set before the socket transport is built. | // It must be set before the socket transport is built. | |||
NeckoOriginAttributes mOriginAttributes; | NeckoOriginAttributes mOriginAttributes; | |||
uint16_t SocketPort() { return (!mProxyHost.IsEmpty() && !mProxyTran sparent) ? mProxyPort : mPort; } | uint16_t SocketPort() { return (!mProxyHost.IsEmpty() && !mProxyTran sparent) ? mProxyPort : mPort; } | |||
const nsCString &SocketHost() { return (!mProxyHost.IsEmpty() && !mProxyTran sparent) ? mProxyHost : mHost; } | const nsCString &SocketHost() { return (!mProxyHost.IsEmpty() && !mProxyTran sparent) ? mProxyHost : mHost; } | |||
Atomic<bool> mInputClosed{true}; | ||||
Atomic<bool> mOutputClosed{true}; | ||||
//------------------------------------------------------------------------- | //------------------------------------------------------------------------- | |||
// members accessible only on the socket transport thread: | // members accessible only on the socket transport thread: | |||
// (the exception being initialization/shutdown time) | // (the exception being initialization/shutdown time) | |||
//------------------------------------------------------------------------- | //------------------------------------------------------------------------- | |||
// socket state vars: | // socket state vars: | |||
uint32_t mState; // STATE_??? flags | uint32_t mState; // STATE_??? flags | |||
bool mAttached; | bool mAttached; | |||
bool mInputClosed; | ||||
bool mOutputClosed; | ||||
// The platform-specific network interface id that this socket | // The platform-specific network interface id that this socket | |||
// associated with. | // associated with. | |||
nsCString mNetworkInterfaceId; | nsCString mNetworkInterfaceId; | |||
// this flag is used to determine if the results of a host lookup arrive | // this flag is used to determine if the results of a host lookup arrive | |||
// recursively or not. this flag is not protected by any lock. | // recursively or not. this flag is not protected by any lock. | |||
bool mResolving; | bool mResolving; | |||
nsCOMPtr<nsICancelable> mDNSRequest; | nsCOMPtr<nsICancelable> mDNSRequest; | |||
skipping to change at line 458 | skipping to change at line 459 | |||
// True if keepalive has been enabled by the socket owner. Note: Keepalive | // True if keepalive has been enabled by the socket owner. Note: Keepalive | |||
// must also be enabled globally for it to be enabled in TCP. | // must also be enabled globally for it to be enabled in TCP. | |||
bool mKeepaliveEnabled; | bool mKeepaliveEnabled; | |||
// Keepalive config (support varies by platform). | // Keepalive config (support varies by platform). | |||
int32_t mKeepaliveIdleTimeS; | int32_t mKeepaliveIdleTimeS; | |||
int32_t mKeepaliveRetryIntervalS; | int32_t mKeepaliveRetryIntervalS; | |||
int32_t mKeepaliveProbeCount; | int32_t mKeepaliveProbeCount; | |||
bool mDoNotRetryToConnect; | Atomic<bool> mDoNotRetryToConnect{false}; | |||
}; | }; | |||
} // namespace net | } // namespace net | |||
} // namespace mozilla | } // namespace mozilla | |||
#endif // !nsSocketTransport_h__ | #endif // !nsSocketTransport_h__ | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 4 lines changed or added |