2 files changed, 5 insertions, 2 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 5018f3faec9..53150c0e2bd 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,9 @@
 Changes since version 3.2.X (binary incompatible)
 -------------------------------------------------
 
+- There is no longer a limit on the allowable length of a property 
+  line in an Ice config file. Previously the limit was 1024.
+
 - It's now possible to change the compression setting for a fixed
   proxy. In previous releases, calling ice_compress on a fixed proxy
   would raise Ice::FixedProxyException. 
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 318ad95bfbd..5ce4195df61 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -291,8 +291,8 @@ Ice::PropertiesI::load(const std::string& file)
         throw ex;
     }
 
-    char line[1024];
-    while(in.getline(line, 1024))
+    string line;
+    while(getline(in, line))
     {
         parseLine(line, _converter);
     }