[mapserver-commits] r11824 - in branches/branch-5-6/mapserver: . mapscript/php3

[svn at osgeo.org]

Author: aboudreault
Date: 2011-06-15 12:56:51 -0700 (Wed, 15 Jun 2011)
New Revision: 11824

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/mapscript/php3/php_mapscript.c
Log:
Backport in branch 5.6: Fixed PHP/MapScript ms_iogetstdoutbufferbytes() always returning 0 bytes written (#3041) 

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2011-06-14 21:02:11 UTC (rev 11823)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2011-06-15 19:56:51 UTC (rev 11824)
@@ -14,6 +14,8 @@
 Version 5.6.7 (SVN branch-5-6):
 ---------------------------
 
+- Fixed PHP/MapScript ms_iogetstdoutbufferbytes() always returning 0 bytes written (#3041)
+
 - OGC Filter: fix segfault when a ows_varname_type or wfs_varname_type is
   defined but not a gml_varname_type (#3902)
 

Modified: branches/branch-5-6/mapserver/mapscript/php3/php_mapscript.c
===================================================================
--- branches/branch-5-6/mapserver/mapscript/php3/php_mapscript.c	2011-06-14 21:02:11 UTC (rev 11823)
+++ branches/branch-5-6/mapserver/mapscript/php3/php_mapscript.c	2011-06-15 19:56:51 UTC (rev 11824)
@@ -16732,7 +16732,8 @@
 
     php_write(gdBuf.data, gdBuf.size TSRMLS_CC);
 
-    RETURN_LONG(buf->data_len);
+    /* return the gdBuf.size, which is the "really used length" of the msIOBuffer */ 
+    RETURN_LONG(gdBuf.size); 
 }
 
 DLEXPORT void php_ms_IO_stripStdoutBufferContentType(INTERNAL_FUNCTION_PARAMETERS)