[SCM] mapserver branch, master, updated. upstream/6.2.0-42-ga6d3a03

[Alan Boudreault]

The following commit has been merged in the master branch:
commit a6d3a033982f6ee6683f1e1c019e7234535b7dc4
Author: Alan Boudreault <aboudreault at mapgears.com>
Date:   Fri Jun 14 12:54:04 2013 +0000

    Added patch php_segfault

diff --git a/debian/patches/php_segfault b/debian/patches/php_segfault
new file mode 100644
index 0000000..53c2b76
--- /dev/null
+++ b/debian/patches/php_segfault
@@ -0,0 +1,11 @@
+--- a/mapscript/php/php_mapscript.c
++++ b/mapscript/php/php_mapscript.c
+@@ -169,7 +169,7 @@
+   map = mapObj_newFromString(string, path);
+ 
+   if (map == NULL) {
+-    mapscript_throw_mapserver_exception("Failed to open map file \"%s\", or map file error." TSRMLS_CC,  string);
++    mapscript_throw_mapserver_exception("Error while loading map file from string." TSRMLS_CC);
+     return;
+   }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8b1a364..73cca95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 fixmapscriptvars.patch
+php_segfault
+debian-changes-6.2.1-1

-- 
Mapserver