[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 a8d674ec1f33a059634cd482d0e9c4d7aa757d3c
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 5 15:20:36 2012 +0100

    Fixed function call in php54 patch.

diff --git a/debian/patches/php54 b/debian/patches/php54
index f330c34..3c69a10 100644
--- a/debian/patches/php54
+++ b/debian/patches/php54
@@ -49,7 +49,7 @@ Index: mapserver/mapscript/php/image.c
  
      /* if there is no output buffer active, set the header */
 -    if (OG(ob_nesting_level)<=0)
-+    if (php_output_get_level(TSRMLS_D)<=0)
++    if (php_output_get_level()<=0)
      {
          php_header(TSRMLS_C);
      }

-- 
Mapserver