[mapserver-commits] r9393 - trunk/mapserver

[svn at osgeo.org]

Author: tomkralidis
Date: 2009-10-06 16:47:35 -0400 (Tue, 06 Oct 2009)
New Revision: 9393

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapwfs.c
Log:
minor fix to correct numberOfResults when maxfeatures is set in mapfile (#2907)


Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-06 19:45:18 UTC (rev 9392)
+++ trunk/mapserver/HISTORY.TXT	2009-10-06 20:47:35 UTC (rev 9393)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- minor fix to correct numberOfResults when maxfeatures is set in mapfile (#2907)
+
 - Fixed possible crash with WFS GetFeature when no projection is specified 
   at the map level (#3129)
 

Modified: trunk/mapserver/mapwfs.c
===================================================================
--- trunk/mapserver/mapwfs.c	2009-10-06 19:45:18 UTC (rev 9392)
+++ trunk/mapserver/mapwfs.c	2009-10-06 20:47:35 UTC (rev 9393)
@@ -1670,7 +1670,7 @@
         }
       }
 
-     if(maxfeatures > 0) {
+     if(maxfeatures > 0 && maxfeatures < iNumberOfFeatures) {
          iNumberOfFeatures = maxfeatures;
      }