1 files changed, 66 insertions, 14 deletions
diff --git a/third_party/libjingle/mods-since-v0_4_0.diff b/third_party/libjingle/mods-since-v0_4_0.diff
index b36cf65..afddbc2 100644
--- a/third_party/libjingle/mods-since-v0_4_0.diff
+++ b/third_party/libjingle/mods-since-v0_4_0.diff
@@ -1,4 +1,3 @@
-Only in libjingle/files: .svn
 Only in libjingle-0.4.0: Makefile.in
 diff -r libjingle-0.4.0/README libjingle/files/README
 1,39c1,39
@@ -206,16 +205,43 @@ Only in libjingle-0.4.0: depcomp
 Only in libjingle-0.4.0: install-sh
 Only in libjingle-0.4.0: ltmain.sh
 Only in libjingle-0.4.0: missing
-Only in libjingle/files/talk: .svn
 Only in libjingle-0.4.0/talk: Makefile.in
-Only in libjingle/files/talk/base: .svn
 Only in libjingle-0.4.0/talk/base: Makefile.in
+diff -r libjingle-0.4.0/talk/base/asynchttprequest.cc libjingle/files/talk/base/asynchttprequest.cc
+73c73
+<     talk_base::SSLAdapter * ssl_adapter = talk_base::SSLAdapter::Create(socket);
+---
+>     talk_base::SSLAdapter * ssl_adapter = factory_->CreateSSLAdapter(socket);
+75c75,81
+<     ssl_adapter->StartSSL(hostname_.c_str(), true);
+---
+>     int error = ssl_adapter->StartSSL(hostname_.c_str(),
+>                                       use_restartable_ssl_sockets_);
+>     if (error != 0) {
+>       LOG(LS_WARNING) << "Could not start SSL; error = " << error;
+>       delete ssl_adapter;
+>       return 0;
+>     }
 diff -r libjingle-0.4.0/talk/base/asynchttprequest.h libjingle/files/talk/base/asynchttprequest.h
 23,24c23
 <   public SignalThread,
 <   public sigslot::has_slots<> {
 ---
 >   public SignalThread {
+106c105,106
+<       binary_mode_(false), agent_(user_agent) { }
+---
+>       binary_mode_(false), agent_(user_agent),
+>       ignore_bad_cert_(false), use_restartable_ssl_sockets_(false) { }
+114a115,120
+>   bool use_restartable_ssl_sockets() const {
+>     return use_restartable_ssl_sockets_;
+>   }
+>   void SetUseRestartableSSLSockets(bool use_restartable_ssl_sockets) {
+>     use_restartable_ssl_sockets_ = use_restartable_ssl_sockets;
+>   }
+133a140
+>   bool use_restartable_ssl_sockets_;
 diff -r libjingle-0.4.0/talk/base/asynctcpsocket.cc libjingle/files/talk/base/asynctcpsocket.cc
 31a32,33
 > #include <cstring>
@@ -305,6 +331,18 @@ diff -r libjingle-0.4.0/talk/base/httpclient.cc libjingle/files/talk/base/httpcl
 diff -r libjingle-0.4.0/talk/base/logging.cc libjingle/files/talk/base/logging.cc
 27a28
 > #include <stdio.h>
+76c77
+< #if _DEBUG
+---
+> #if LOGGING
+78c79
+< #else  // !_DEBUG
+---
+> #else
+80c81
+< #endif  // !_DEBUG
+---
+> #endif
 diff -r libjingle-0.4.0/talk/base/logging.h libjingle/files/talk/base/logging.h
 67a68,69
 > 
@@ -313,6 +351,10 @@ diff -r libjingle-0.4.0/talk/base/logging.h libjingle/files/talk/base/logging.h
 > #endif // defined(SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS)
 195a199
 > #if defined(SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS)
+197c201
+< #if defined(_DEBUG) && !defined(NDEBUG)
+---
+> #if !defined(NDEBUG)
 290a295
 > #endif  // defined(SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS)
 diff -r libjingle-0.4.0/talk/base/messagequeue.cc libjingle/files/talk/base/messagequeue.cc
@@ -802,7 +844,6 @@ diff -r libjingle-0.4.0/talk/base/signalthread.h libjingle/files/talk/base/signa
 >     kComplete,        // Work is done
 >     kStopping,        // Work is being interrupted
 >   } state_;
-Only in libjingle/files/talk/base: signalthread_unittest.cc
 diff -r libjingle-0.4.0/talk/base/socket.h libjingle/files/talk/base/socket.h
 77a78
 > #undef ETIMEDOUT // remove pthread.h's definition
@@ -810,6 +851,20 @@ diff -r libjingle-0.4.0/talk/base/socketadapters.cc libjingle/files/talk/base/so
 43a44,45
 > #include <cstring>
 > 
+diff -r libjingle-0.4.0/talk/base/socketfactory.h libjingle/files/talk/base/socketfactory.h
+32a33
+> #include "talk/base/ssladapter.h"
+46a48,52
+> 
+>   // Wraps the given socket in an SSL adapter.
+>   virtual SSLAdapter* CreateSSLAdapter(AsyncSocket* socket) {
+>     return SSLAdapter::Create(socket);
+>   }
+diff -r libjingle-0.4.0/talk/base/socketpool.cc libjingle/files/talk/base/socketpool.cc
+142d141
+<     ASSERT(false);
+189d187
+<       ASSERT(false);
 diff -r libjingle-0.4.0/talk/base/ssladapter.cc libjingle/files/talk/base/ssladapter.cc
 34c34,35
 < #define SSL_USE_OPENSSL 1
@@ -906,23 +961,25 @@ diff -r libjingle-0.4.0/talk/base/thread.cc libjingle/files/talk/base/thread.cc
 128a139,140
 >   CritScope cs(&started_crit_);
 >   stopped_ = true;
-168a181,184
+131a144
+>     started_ = false;
+168a182,185
 >   CritScope cs(&started_crit_);
 >   // Make sure Join() hasn't been called yet.
 >   if (stopped_)
 >     return;
-181a198,199
+181a199,200
 >   CritScope cs(&started_crit_);
 >   stopped_ = true;
-191a210,212
+191a211,213
 >   // Make sure the thread hasn't been deleted.
 >   if (!g_thmgr.ThreadActive(thread))
 >     return NULL;
-207c228
+207c229
 <   MessageQueue::Stop();
 ---
 >   MessageQueue::Quit();
-329c350
+329c351
 <       return false;
 ---
 >       return !IsQuitting();
@@ -957,9 +1014,7 @@ Only in libjingle/files/talk/base: winsock_initializer.h
 Only in libjingle-0.4.0/talk: examples
 Only in libjingle-0.4.0/talk: libjingle.sln
 Only in libjingle-0.4.0/talk: libjingle.vcproj
-Only in libjingle/files/talk/p2p: .svn
 Only in libjingle-0.4.0/talk/p2p: Makefile.in
-Only in libjingle/files/talk/p2p/base: .svn
 Only in libjingle-0.4.0/talk/p2p/base: Makefile.in
 diff -r libjingle-0.4.0/talk/p2p/base/p2ptransport.cc libjingle/files/talk/p2p/base/p2ptransport.cc
 37c37
@@ -1009,7 +1064,6 @@ diff -r libjingle-0.4.0/talk/p2p/base/transport.cc libjingle/files/talk/p2p/base
 < #include "talk/xmpp/constants.h"
 ---
 > #include "talk/xmpp/xmppconstants.h"
-Only in libjingle/files/talk/p2p/client: .svn
 Only in libjingle-0.4.0/talk/p2p/client: Makefile.in
 diff -r libjingle-0.4.0/talk/p2p/client/httpportallocator.cc libjingle/files/talk/p2p/client/httpportallocator.cc
 82c82
@@ -1018,7 +1072,6 @@ diff -r libjingle-0.4.0/talk/p2p/client/httpportallocator.cc libjingle/files/tal
 >   relay_hosts_.push_back("relay.google.com");
 Only in libjingle-0.4.0/talk: session
 Only in libjingle-0.4.0/talk: third_party
-Only in libjingle/files/talk/xmllite: .svn
 Only in libjingle-0.4.0/talk/xmllite: Makefile.in
 diff -r libjingle-0.4.0/talk/xmllite/qname.cc libjingle/files/talk/xmllite/qname.cc
 39c39
@@ -1170,7 +1223,6 @@ diff -r libjingle-0.4.0/talk/xmllite/xmlprinter.cc libjingle/files/talk/xmllite/
 > XmlPrinterImpl::PrintCDATAText(const std::string & text) {
 >   *pout_ << "<![CDATA[" << text << "]]>";
 > }
-Only in libjingle/files/talk/xmpp: .svn
 Only in libjingle-0.4.0/talk/xmpp: Makefile.in
 Only in libjingle-0.4.0/talk/xmpp: constants.cc
 Only in libjingle-0.4.0/talk/xmpp: constants.h