diff options
| author | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
| commit | dc5678e6988bad79336033518f8f2378f7c34cb2 (patch) | |
| tree | f1b7d00d8bfde31297c4473d62ace3d05031b985 /php/src | |
| parent | Connection wizard dialog becomes readonly (diff) | |
| parent | ICE-7506 - Update copyright to 2017 (diff) | |
| download | ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.bz2 ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.xz ice-dc5678e6988bad79336033518f8f2378f7c34cb2.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'php/src')
41 files changed, 40 insertions, 78 deletions
diff --git a/php/src/php5/Communicator.cpp b/php/src/php5/Communicator.cpp index 964a255599d..a541b426ebe 100644 --- a/php/src/php5/Communicator.cpp +++ b/php/src/php5/Communicator.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Communicator.h b/php/src/php5/Communicator.h index 30f07d273e1..71ca59e5adc 100644 --- a/php/src/php5/Communicator.h +++ b/php/src/php5/Communicator.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Config.h b/php/src/php5/Config.h index 8df1b6099f3..9c80de86f59 100644 --- a/php/src/php5/Config.h +++ b/php/src/php5/Config.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Connection.cpp b/php/src/php5/Connection.cpp index 12aa1a7c2aa..8a894b2457a 100644 --- a/php/src/php5/Connection.cpp +++ b/php/src/php5/Connection.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Connection.h b/php/src/php5/Connection.h index cfdaef321ae..191e3b218c7 100644 --- a/php/src/php5/Connection.h +++ b/php/src/php5/Connection.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Endpoint.cpp b/php/src/php5/Endpoint.cpp index 8ba0c1cc993..5aab9240dff 100644 --- a/php/src/php5/Endpoint.cpp +++ b/php/src/php5/Endpoint.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Endpoint.h b/php/src/php5/Endpoint.h index 1559c0a89f6..62117c98975 100644 --- a/php/src/php5/Endpoint.h +++ b/php/src/php5/Endpoint.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Init.cpp b/php/src/php5/Init.cpp index c69a5aacef0..72cc2f548e7 100644 --- a/php/src/php5/Init.cpp +++ b/php/src/php5/Init.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Logger.cpp b/php/src/php5/Logger.cpp index 2194b61a755..2c92bda3a71 100644 --- a/php/src/php5/Logger.cpp +++ b/php/src/php5/Logger.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Logger.h b/php/src/php5/Logger.h index c3ab3c531c0..6d0ed22116c 100644 --- a/php/src/php5/Logger.h +++ b/php/src/php5/Logger.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Operation.cpp b/php/src/php5/Operation.cpp index ede0a594807..07003b7b4d6 100644 --- a/php/src/php5/Operation.cpp +++ b/php/src/php5/Operation.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Operation.h b/php/src/php5/Operation.h index 91230201bc4..38b520da45b 100644 --- a/php/src/php5/Operation.h +++ b/php/src/php5/Operation.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Properties.cpp b/php/src/php5/Properties.cpp index 8fa43b1d4fb..9f181f4408a 100644 --- a/php/src/php5/Properties.cpp +++ b/php/src/php5/Properties.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Properties.h b/php/src/php5/Properties.h index c4fa8b24e9d..1997461f0c1 100644 --- a/php/src/php5/Properties.h +++ b/php/src/php5/Properties.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Proxy.cpp b/php/src/php5/Proxy.cpp index f65e3fd96d3..5ba77e7e8e1 100644 --- a/php/src/php5/Proxy.cpp +++ b/php/src/php5/Proxy.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Proxy.h b/php/src/php5/Proxy.h index 4becbbdd906..bd1cec725b0 100644 --- a/php/src/php5/Proxy.h +++ b/php/src/php5/Proxy.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp index 93d9f655b24..4e58a36e221 100644 --- a/php/src/php5/Types.cpp +++ b/php/src/php5/Types.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Types.h b/php/src/php5/Types.h index 62309e93648..956bd8fa9af 100644 --- a/php/src/php5/Types.h +++ b/php/src/php5/Types.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Util.cpp b/php/src/php5/Util.cpp index 1f3ea98fb8e..affb9428136 100644 --- a/php/src/php5/Util.cpp +++ b/php/src/php5/Util.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php5/Util.h b/php/src/php5/Util.h index 35b2b025c22..1242b63a9be 100644 --- a/php/src/php5/Util.h +++ b/php/src/php5/Util.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Communicator.cpp b/php/src/php7/Communicator.cpp index 2c63100e908..50e124a2615 100644 --- a/php/src/php7/Communicator.cpp +++ b/php/src/php7/Communicator.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Communicator.h b/php/src/php7/Communicator.h index 7941f7c9aa1..5498fb5cacf 100644 --- a/php/src/php7/Communicator.h +++ b/php/src/php7/Communicator.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Config.h b/php/src/php7/Config.h index 5d2ce5e0b91..3810cd9d940 100644 --- a/php/src/php7/Config.h +++ b/php/src/php7/Config.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Connection.cpp b/php/src/php7/Connection.cpp index 826878a194b..0afade3d709 100644 --- a/php/src/php7/Connection.cpp +++ b/php/src/php7/Connection.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Connection.h b/php/src/php7/Connection.h index 38ae32a56fa..adb29df586b 100644 --- a/php/src/php7/Connection.h +++ b/php/src/php7/Connection.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Endpoint.cpp b/php/src/php7/Endpoint.cpp index 69858fadbc9..c10d073bb4e 100644 --- a/php/src/php7/Endpoint.cpp +++ b/php/src/php7/Endpoint.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Endpoint.h b/php/src/php7/Endpoint.h index b26a388f631..2492b097814 100644 --- a/php/src/php7/Endpoint.h +++ b/php/src/php7/Endpoint.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/IcePHP.rc b/php/src/php7/IcePHP.rc deleted file mode 100644 index c8ce8e847d7..00000000000 --- a/php/src/php7/IcePHP.rc +++ /dev/null @@ -1,38 +0,0 @@ -#include<IceUtil/ResourceConfig.h> - -#ifdef ZTS -# define ICE_INTERNALNAME "ice_php_nts\0" -# define ICE_ORIGINALFILENAME "ice_php_nts.dll\0" -#else -# define ICE_INTERNALNAME "ice_php\0" -# define ICE_ORIGINALFILENAME "ice_php.dll\0" -#endif - -VS_VERSION_INFO VERSIONINFO -FILEVERSION ICE_VERSION -PRODUCTVERSION ICE_VERSION -FILEFLAGSMASK VS_FFI_FILEFLAGSMASK -FILEOS VOS_NT_WINDOWS32 -FILETYPE VFT_DLL -FILESUBTYPE VFT2_UNKNOWN -FILEFLAGS VER_DEBUG -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904e4" - BEGIN - VALUE "CompanyName", ICE_COMPANY_NAME - VALUE "FileDescription", "Ice for PHP Extension\0" - VALUE "FileVersion", ICE_STRING_VERSION - VALUE "InternalName", ICE_INTERNALNAME - VALUE "LegalCopyright", ICE_COPYRIGHT - VALUE "OriginalFilename", ICE_ORIGINALFILENAME - VALUE "ProductName", ICE_PRODUCT_NAME - VALUE "ProductVersion", ICE_STRING_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1252 - END -END diff --git a/php/src/php7/Init.cpp b/php/src/php7/Init.cpp index 597b633c3ff..15b19085ad1 100644 --- a/php/src/php7/Init.cpp +++ b/php/src/php7/Init.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Logger.cpp b/php/src/php7/Logger.cpp index 0660740e84a..e52dd794ab9 100644 --- a/php/src/php7/Logger.cpp +++ b/php/src/php7/Logger.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Logger.h b/php/src/php7/Logger.h index 7ab38b6c42c..e16c38c651e 100644 --- a/php/src/php7/Logger.h +++ b/php/src/php7/Logger.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Operation.cpp b/php/src/php7/Operation.cpp index 2e9c91b29f6..6bc99e50c1a 100644 --- a/php/src/php7/Operation.cpp +++ b/php/src/php7/Operation.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Operation.h b/php/src/php7/Operation.h index 91230201bc4..38b520da45b 100644 --- a/php/src/php7/Operation.h +++ b/php/src/php7/Operation.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Properties.cpp b/php/src/php7/Properties.cpp index 07892920a50..e394d62c00c 100644 --- a/php/src/php7/Properties.cpp +++ b/php/src/php7/Properties.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Properties.h b/php/src/php7/Properties.h index 44584abccfd..b27572252c1 100644 --- a/php/src/php7/Properties.h +++ b/php/src/php7/Properties.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Proxy.cpp b/php/src/php7/Proxy.cpp index 1532aaec823..23b6e4d7806 100644 --- a/php/src/php7/Proxy.cpp +++ b/php/src/php7/Proxy.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Proxy.h b/php/src/php7/Proxy.h index a2b02bdc3b4..144193f35e2 100644 --- a/php/src/php7/Proxy.h +++ b/php/src/php7/Proxy.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp index 586e438ab21..0a9c0141eeb 100644 --- a/php/src/php7/Types.cpp +++ b/php/src/php7/Types.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Types.h b/php/src/php7/Types.h index 971f7837cf6..f9b193bb77e 100644 --- a/php/src/php7/Types.h +++ b/php/src/php7/Types.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Util.cpp b/php/src/php7/Util.cpp index bb38b45066a..ebea5a137e4 100644 --- a/php/src/php7/Util.cpp +++ b/php/src/php7/Util.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/php/src/php7/Util.h b/php/src/php7/Util.h index 63384679a86..4ddc670199c 100644 --- a/php/src/php7/Util.h +++ b/php/src/php7/Util.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. |