diff options
| author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 19:50:58 +0000 |
|---|---|---|
| committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-22 19:50:58 +0000 |
| commit | b43c97c9b09d545890942909d1a0a4102847430b (patch) | |
| tree | 11bdec99230d9ed84f1432d8b99cd9b087bec827 /net/net_lib.scons | |
| parent | 3d13c830adf25a9884e5f1e5c0ee4ceae0d40d66 (diff) | |
| download | chromium_src-b43c97c9b09d545890942909d1a0a4102847430b.zip chromium_src-b43c97c9b09d545890942909d1a0a4102847430b.tar.gz chromium_src-b43c97c9b09d545890942909d1a0a4102847430b.tar.bz2 | |
Port SSLClientSocket to Linux
Passes tests (once you enable them by removing DISABLED_).
Probably want to add a mock https server so we can leave those tests enabled when we check in.
Had to add full duplex support to TCPClientSocket on Linux
to avoid kludgy plumbing issues.
Also had to add dummy implementation of
X509Certificate::~X509Certificate to prevent link error.
Rediffed to current trunk, addressed all review issues.
Review URL: http://codereview.chromium.org/4049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_lib.scons')
| -rw-r--r-- | net/net_lib.scons | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/net_lib.scons b/net/net_lib.scons index 7de96f0..9f147a9 100644 --- a/net/net_lib.scons +++ b/net/net_lib.scons @@ -54,7 +54,6 @@ input_files = [ 'base/registry_controlled_domain.cc', 'base/sdch_filter.cc', 'base/sdch_manager.cc', - 'base/ssl_client_socket_win.cc', 'base/ssl_config_service.cc', 'base/tcp_client_socket.cc', 'base/telnet_server.cc', @@ -115,11 +114,9 @@ if env['PLATFORM'] in ('posix', 'darwin'): # Remove files that still need to be ported from the input_files list. # TODO(port): delete files from this list as they get ported. to_be_ported_files = [ - 'base/client_socket_factory.cc', 'base/directory_lister.cc', 'base/dns_resolution_observer.cc', 'base/listen_socket.cc', - 'base/ssl_client_socket_win.cc', 'base/ssl_config_service.cc', 'base/tcp_client_socket.cc', 'base/telnet_server.cc', @@ -147,6 +144,7 @@ if env['PLATFORM'] == 'win32': 'base/file_input_stream_win.cc', 'base/net_util_win.cc', 'base/platform_mime_util_win.cc', + 'base/ssl_client_socket_win.cc', 'base/x509_certificate_win.cc', 'disk_cache/cache_util_win.cc', 'disk_cache/file_win.cc', @@ -162,8 +160,11 @@ if env['PLATFORM'] == 'darwin': if env['PLATFORM'] == 'posix': input_files.extend([ + 'base/nss_memio.c', # TODO(tc): gnome-vfs? xdgmime? /etc/mime.types? 'base/platform_mime_util_linux.cc', + 'base/ssl_client_socket_nss.cc', + 'base/x509_certificate_nss.cc', ]) if env['PLATFORM'] in ('darwin', 'posix'): |