forward ported changes in 2.8.7 from WX_2_8_BRNACH

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/url.cpp

@@ -406,6 +406,8 @@ void wxURL::SetProxy(const wxString& url_proxy)
 class wxURLModule : public wxModule
 {
 public:
+    wxURLModule();
+
     virtual bool OnInit();
     virtual void OnExit();
 
@@ -415,6 +417,13 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxURLModule, wxModule)
 
+wxURLModule::wxURLModule()
+{
+    // we must be cleaned up before wxSocketModule as otherwise deleting
+    // ms_proxyDefault from our OnExit() won't work (and can actually crash)
+    AddDependency(wxClassInfo::FindClass(_T("wxSocketModule")));
+}
+
 bool wxURLModule::OnInit()
 {
 #if wxUSE_PROTOCOL_HTTP