zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/cpp/src/Ice/EndpointFactoryF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointI.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointI.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -160,6 +160,38 @@ inline bool operator<(const EndpointI& l, const EndpointI& r)
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
 
+template<typename T> class InfoI : public T
+{
+public:
+
+    InfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint)
+    {
+    }
+
+    virtual Ice::Short
+    type() const
+    {
+        return _endpoint->type();
+    }
+
+    virtual bool
+    datagram() const
+    {
+        return _endpoint->datagram();
+    }
+
+    virtual bool
+    secure() const
+    {
+        return _endpoint->secure();
+    }
+
+private:
+
+    const EndpointIPtr _endpoint;
+};
+
+
 }
 
 #endif

data/ext/ice/cpp/src/Ice/EndpointIF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EndpointTypes.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -28,8 +28,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 

data/ext/ice/cpp/src/Ice/EventHandler.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/EventHandler.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -71,6 +71,9 @@ protected:
     friend class ThreadPool;
     friend class ThreadPoolCurrent;
     friend class Selector;
+#ifdef ICE_USE_CFSTREAM
+    friend class EventHandlerWrapper;
+#endif
 };
 
 }

data/ext/ice/cpp/src/Ice/EventHandlerF.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/Exception.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -102,7 +102,7 @@ throwMarshalException(const char* file, int line, const string& reason)
 }
 }
 
-void 
+void
 Ice::UserException::__write(::IceInternal::BasicStream* os) const
 {
     os->startWriteException(0);
@@ -110,7 +110,7 @@ Ice::UserException::__write(::IceInternal::BasicStream* os) const
     os->endWriteException();
 }
 
-void 
+void
 Ice::UserException::__read(::IceInternal::BasicStream* is)
 {
     is->startReadException();
@@ -118,7 +118,7 @@ Ice::UserException::__read(::IceInternal::BasicStream* is)
     is->endReadException(false);
 }
 
-void 
+void
 Ice::UserException::__write(const Ice::OutputStreamPtr& os) const
 {
     os->startException(0);
@@ -126,7 +126,7 @@ Ice::UserException::__write(const Ice::OutputStreamPtr& os) const
     os->endException();
 }
 
-void 
+void
 Ice::UserException::__read(const Ice::InputStreamPtr& is)
 {
     is->startException();
@@ -134,13 +134,13 @@ Ice::UserException::__read(const Ice::InputStreamPtr& is)
     is->endException(false);
 }
 
-void 
+void
 Ice::UserException::__writeImpl(const Ice::OutputStreamPtr&) const
 {
     throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support");
 }
 
-void 
+void
 Ice::UserException::__readImpl(const Ice::InputStreamPtr&)
 {
     throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support");
@@ -557,7 +557,7 @@ void
 Ice::UnsupportedEncodingException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nprotocol error: unsupported encoding version: " << bad;
+    out << ":\nencoding error: unsupported encoding version: " << bad;
     out << "\n(can only support encodings compatible with version " << supported << ")";
     if(!reason.empty())
     {
@@ -706,19 +706,19 @@ Ice::NoObjectFactoryException::ice_print(ostream& out) const
     {
         out << ":\n" << reason;
     }
-}       
+}
 
 void
 Ice::UnexpectedObjectException::ice_print(ostream& out) const
 {
     Exception::ice_print(out);
-    out << ":\nunexpected class instance of type `" << type << 
+    out << ":\nunexpected class instance of type `" << type <<
         "'; expected instance of type `" << expectedType << "'";
     if(!reason.empty())
     {
         out << ":\n" << reason;
     }
-}       
+}
 
 void
 Ice::MemoryLimitException::ice_print(ostream& out) const
@@ -830,3 +830,12 @@ Ice::ResponseSentException::ice_print(ostream& out) const
     Exception::ice_print(out);
     out << ":\nresponse sent exception";
 }
+
+#ifdef ICE_USE_CFSTREAM
+void
+Ice::CFNetworkException::ice_print(ostream& out) const
+{
+    Exception::ice_print(out);
+    out << ":\nnetwork exception: domain: " << domain << " error: " << error;
+}
+#endif

data/ext/ice/cpp/src/Ice/FacetMap.cpp

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
 //
-// Ice version 3.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -28,7 +28,13 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/FactoryTable.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -19,7 +19,7 @@ namespace IceInternal
 // Single global instance of the factory table for non-local
 // exceptions and non-abstract classes.
 //
-ICE_DECLSPEC_EXPORT FactoryTable* factoryTable;
+ICE_API FactoryTable* factoryTable;
 
 }
 

data/ext/ice/cpp/src/Ice/GCObject.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/HashUtil.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ice/cpp/src/Ice/HttpParser.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -258,10 +258,9 @@ IceInternal::HttpParser::parse(const Ice::Byte* begin, const Ice::Byte* end)
                     {
                         throw WebSocketException("malformed header");
                     }
-                    HeaderMap::iterator q = _headers.find(_headerName);
+                    HeaderFields::iterator q = _headers.find(_headerName);
                     assert(q != _headers.end());
-                    string newValue = q->second + " " + string(start, p);
-                    _headers[_headerName] = newValue;
+                    q->second.second = q->second.second + " " + string(start, p);
                     _state = c == CR ? StateHeaderFieldLF : StateHeaderFieldStart;
                 }
                 else
@@ -301,13 +300,13 @@ IceInternal::HttpParser::parse(const Ice::Byte* begin, const Ice::Byte* end)
             if(_headerName.empty())
             {
                 _headerName = IceUtilInternal::toLower(string(start, p));
-                HeaderMap::iterator q = _headers.find(_headerName);
+                HeaderFields::iterator q = _headers.find(_headerName);
                 //
                 // Add a placeholder entry if necessary.
                 //
                 if(q == _headers.end())
                 {
-                    _headers[_headerName] = "";
+                    _headers[_headerName] = make_pair(string(start, p), "");
                 }
             }
 
@@ -362,14 +361,18 @@ IceInternal::HttpParser::parse(const Ice::Byte* begin, const Ice::Byte* end)
             assert(c == CR || c == LF);
             if(p > start)
             {
-                HeaderMap::iterator q = _headers.find(_headerName);
-                if(q == _headers.end() || q->second.empty())
+                HeaderFields::iterator q = _headers.find(_headerName);
+                if(q == _headers.end())
+                {
+                    throw WebSocketException("malformed header");
+                }
+                else if(q->second.second.empty())
                 {
-                    _headers[_headerName] = string(start, p);
+                    q->second.second = string(start, p);
                 }
                 else
                 {
-                    _headers[_headerName] = q->second + ", " + string(start, p);
+                    q->second.second = q->second.second + ", " + string(start, p);
                 }
             }
 
@@ -663,18 +666,27 @@ IceInternal::HttpParser::reason() const
 bool
 IceInternal::HttpParser::getHeader(const string& name, string& value, bool toLower) const
 {
-    HeaderMap::const_iterator q = _headers.find(IceUtilInternal::toLower(name));
+    HeaderFields::const_iterator q = _headers.find(IceUtilInternal::toLower(name));
     if(q != _headers.end())
     {
-        value = toLower ? IceUtilInternal::toLower(IceUtilInternal::trim(q->second)) : IceUtilInternal::trim(q->second);
+        value = IceUtilInternal::trim(q->second.second);
+        if(toLower)
+        {
+            value = IceUtilInternal::toLower(value);
+        }
         return true;
     }
 
     return false;
 }
 
-const HttpParser::HeaderMap&
-IceInternal::HttpParser::headers() const
+map<string, string>
+IceInternal::HttpParser::getHeaders() const
 {
-    return _headers;
+    map<string, string> headers;
+    for(HeaderFields::const_iterator q = _headers.begin(); q != _headers.end(); ++q)
+    {
+        headers.insert(make_pair(q->second.first, IceUtilInternal::trim(q->second.second)));
+    }
+    return headers;
 }

data/ext/ice/cpp/src/Ice/HttpParser.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -19,7 +19,7 @@ namespace IceInternal
 
 std::vector<unsigned char> calcSHA1(const std::vector<unsigned char>&);
 
-typedef std::map<std::string, std::string> HeaderFields;
+typedef std::map<std::string, std::pair<std::string, std::string> > HeaderFields;
 
 class WebSocketException
 {
@@ -58,9 +58,7 @@ public:
 
     bool getHeader(const std::string&, std::string&, bool) const;
 
-    typedef std::map<std::string, std::string> HeaderMap;
-
-    const HeaderMap& headers() const;
+    std::map<std::string, std::string> getHeaders() const;
 
 private:
 
@@ -69,7 +67,7 @@ private:
     std::string _method;
     std::string _uri;
 
-    HeaderMap _headers;
+    HeaderFields _headers;
     std::string _headerName;
 
     int _versionMajor;