[mapserver-commits] r10648 - in trunk/mapserver/mapscript: php swiginc

[svn at osgeo.org]

Author: tamas
Date: 2010-10-23 03:27:25 -0700 (Sat, 23 Oct 2010)
New Revision: 10648

Modified:
   trunk/mapserver/mapscript/php/mapscript_i.c
   trunk/mapserver/mapscript/swiginc/owsrequest.i
Log:
Fix for the issues introduced with r10645

Modified: trunk/mapserver/mapscript/php/mapscript_i.c
===================================================================
--- trunk/mapserver/mapscript/php/mapscript_i.c	2010-10-22 21:52:23 UTC (rev 10647)
+++ trunk/mapserver/mapscript/php/mapscript_i.c	2010-10-23 10:27:25 UTC (rev 10648)
@@ -1429,8 +1429,8 @@
     cgiRequestObj *request;
     request = msAllocCgiObj();
 
-    request->ParamNames = (char **) malloc(MS_MAX_CGI_PARAMS*sizeof(char*));
-    request->ParamValues = (char **) malloc(MS_MAX_CGI_PARAMS*sizeof(char*));
+    request->ParamNames = (char **) malloc(MS_DEFAULT_CGI_PARAMS*sizeof(char*));
+    request->ParamValues = (char **) malloc(MS_DEFAULT_CGI_PARAMS*sizeof(char*));
 
     return request;
 }
@@ -1450,7 +1450,7 @@
 {
     int i;
         
-    if (self->NumParams == MS_MAX_CGI_PARAMS) {
+    if (self->NumParams == MS_DEFAULT_CGI_PARAMS) {
       msSetError(MS_CHILDERR, "Maximum number of items, %d, has been reached", "setItem()", MS_MAX_CGI_PARAMS);
     }
         

Modified: trunk/mapserver/mapscript/swiginc/owsrequest.i
===================================================================
--- trunk/mapserver/mapscript/swiginc/owsrequest.i	2010-10-22 21:52:23 UTC (rev 10647)
+++ trunk/mapserver/mapscript/swiginc/owsrequest.i	2010-10-23 10:27:25 UTC (rev 10648)
@@ -54,8 +54,8 @@
             return NULL;
         }
         
-        request->ParamNames = (char **) malloc(MS_MAX_CGI_PARAMS*sizeof(char*));
-        request->ParamValues = (char **) malloc(MS_MAX_CGI_PARAMS*sizeof(char*));
+        request->ParamNames = (char **) malloc(MS_DEFAULT_CGI_PARAMS*sizeof(char*));
+        request->ParamValues = (char **) malloc(MS_DEFAULT_CGI_PARAMS*sizeof(char*));
         if (request->ParamNames==NULL || request->ParamValues==NULL) {
 	        msSetError(MS_MEMERR, NULL, "OWSRequest()");
             return NULL;
@@ -84,8 +84,8 @@
     {
         int i;
         
-        if (self->NumParams == MS_MAX_CGI_PARAMS) {
-            msSetError(MS_CHILDERR, "Maximum number of items, %d, has been reached", "setItem()", MS_MAX_CGI_PARAMS);
+        if (self->NumParams == MS_DEFAULT_CGI_PARAMS) {
+            msSetError(MS_CHILDERR, "Maximum number of items, %d, has been reached", "setItem()", MS_DEFAULT_CGI_PARAMS);
         }
         
         for (i=0; i<self->NumParams; i++) {