3 files changed, 49 insertions, 3 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw
index da8c90e6b42..ce36c36fcf4 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -590,6 +590,12 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name minimalS
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name holdC
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name holdS
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -1674,6 +1680,42 @@ Package=<4>
 
 ###############################################################################
 
+Project: "holdC"=.\test\Ice\hold\holdC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name ice
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name iceutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "holdS"=.\test\Ice\hold\holdS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name ice
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name iceutil
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "ice"=.\src\ice\ice.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/cpp/demo/Ice/hello/config b/cpp/demo/Ice/hello/config
index 39c092f4770..fe88a69d502 100644
--- a/cpp/demo/Ice/hello/config
+++ b/cpp/demo/Ice/hello/config
@@ -2,14 +2,14 @@
 # The client reads this property to create the reference to the
 # "hello" object in the server.
 #
-Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
+Hello.Proxy=hello:tcp -p 10000#:udp -p 10000:ssl -p 10001
 
 #
 # The server creates one single object adapter with the name
 # "Hello". The following line sets the endpoints for this
 # adapter.
 #
-Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
+Hello.Endpoints=tcp -p 10000#:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
@@ -55,7 +55,7 @@ IceSSL.Trace.Security=0
 # An XML based file that specifies the certificates, keys, SSL version
 # and other pertinent information for creating an SSL connection.
 #
-Ice.Plugin.IceSSL=IceSSL:create
+#Ice.Plugin.IceSSL=IceSSL:create
 IceSSL.Client.CertPath=../../../certs
 IceSSL.Client.Config=sslconfig.xml
 IceSSL.Server.CertPath=../../../certs
diff --git a/cpp/test/Ice/hold/holdS.dsp b/cpp/test/Ice/hold/holdS.dsp
index 2d68a74a65e..f77013d88a4 100644
--- a/cpp/test/Ice/hold/holdS.dsp
+++ b/cpp/test/Ice/hold/holdS.dsp
@@ -97,6 +97,10 @@ SOURCE=.\Server.cpp
 
 SOURCE=.\Test.cpp
 # End Source File
+# Begin Source File
+
+SOURCE=.\TestI.cpp
+# End Source File
 # End Group
 # Begin Group "Header Files"