[mapserver-commits] r10193 - in trunk/mapserver: . mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2010-05-28 16:18:58 -0400 (Fri, 28 May 2010)
New Revision: 10193

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/php/php_mapscript.c
Log:
Fixed PHP/MapScript ms_iogetstdoutbufferbytes() always returning 0 bytes written (#3041)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-05-28 19:17:09 UTC (rev 10192)
+++ trunk/mapserver/HISTORY.TXT	2010-05-28 20:18:58 UTC (rev 10193)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Fixed PHP/MapScript ms_iogetstdoutbufferbytes() always returning 0 bytes written (#3041)
+
 - MapScript resultsGetShape() method fails with a OracleSpatial layer (#3462)
 
 - PHP/MapScript circular references between objects (#3405) 

Modified: trunk/mapserver/mapscript/php/php_mapscript.c
===================================================================
--- trunk/mapserver/mapscript/php/php_mapscript.c	2010-05-28 19:17:09 UTC (rev 10192)
+++ trunk/mapserver/mapscript/php/php_mapscript.c	2010-05-28 20:18:58 UTC (rev 10193)
@@ -730,8 +730,9 @@
     buf->data = NULL;
 
     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);
 }
 
 PHP_FUNCTION(ms_ioStripStdoutBufferContentType)