[SCM] mapserver branch, master, updated. upstream/6.0.1-25-g98327ed

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit c33c402d755fcf543b94008624f21675fc1fe276
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 5 15:05:24 2012 +0100

    Now using ob_get_level instead of a global sym.

diff --git a/debian/patches/php54 b/debian/patches/php54
index 527e46b..f330c34 100644
--- a/debian/patches/php54
+++ b/debian/patches/php54
@@ -1,7 +1,7 @@
 Index: mapserver/mapscript/php/php_mapscript_util.c
 ===================================================================
---- mapserver.orig/mapscript/php/php_mapscript_util.c	2011-12-23 11:16:03.000000000 +0100
-+++ mapserver/mapscript/php/php_mapscript_util.c	2012-03-05 13:20:05.000000000 +0100
+--- mapserver.orig/mapscript/php/php_mapscript_util.c	2012-03-05 13:20:27.000000000 +0100
++++ mapserver/mapscript/php/php_mapscript_util.c	2012-03-05 14:55:46.000000000 +0100
 @@ -37,12 +37,18 @@
                                         void (*zend_objects_free_object) TSRMLS_DC)
  {
@@ -40,3 +40,16 @@ Index: mapserver/mapscript/php/php_mapscript_util.c
      retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
      retval.handlers = object_handlers;
      return retval;
+Index: mapserver/mapscript/php/image.c
+===================================================================
+--- mapserver.orig/mapscript/php/image.c	2011-12-23 11:16:03.000000000 +0100
++++ mapserver/mapscript/php/image.c	2012-03-05 15:05:06.000000000 +0100
+@@ -303,7 +303,7 @@
+     /* no filename - read stdout */
+ 
+     /* if there is no output buffer active, set the header */
+-    if (OG(ob_nesting_level)<=0)
++    if (php_output_get_level(TSRMLS_D)<=0)
+     {
+         php_header(TSRMLS_C);
+     }

-- 
Mapserver