[mapserver-commits] [mapserver/mapserver] 022d24: Backport #4928 and #5356

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: 022d24bd34196b6dca67053fb797a6980210bc54
      https://github.com/mapserver/mapserver/commit/022d24bd34196b6dca67053fb797a6980210bc54
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M mapogr.cpp
    M mappostgis.c

  Log Message:
  -----------
  Backport #4928 and #5356


  Commit: 3cf2cea402442de4c606b4192034447355cae8c4
      https://github.com/mapserver/mapserver/commit/3cf2cea402442de4c606b4192034447355cae8c4
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M mappostgis.c

  Log Message:
  -----------
  Merge branch 'branch-6-4' into branch-7-0


  Commit: e9d06071b534a8658ee1e5498f945b9995a125df
      https://github.com/mapserver/mapserver/commit/e9d06071b534a8658ee1e5498f945b9995a125df
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  7-0 backport: Fix travis builds, remove 5.6 until build fix is worked on


  Commit: a6bc35db5ac38bd58d269bdd00efd3816f0a1df4
      https://github.com/mapserver/mapserver/commit/a6bc35db5ac38bd58d269bdd00efd3816f0a1df4
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Log Message:
  -----------
  No-op: Merge branch 'branch-6-4' into branch-7-0


  Commit: d5cc5840683bded229dbc2cc7d534db6d1e1f386
      https://github.com/mapserver/mapserver/commit/d5cc5840683bded229dbc2cc7d534db6d1e1f386
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M .travis.yml
    M mapscript/php/error.c

  Log Message:
  -----------
  Fix build issue with php >= 5.6.25 (#5318)


  Commit: 82ec23b2336087df94bfe41f04bec4dfb5102c2f
      https://github.com/mapserver/mapserver/commit/82ec23b2336087df94bfe41f04bec4dfb5102c2f
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M fontcache.c

  Log Message:
  -----------
  Fix glyph orientation when switching from cairo to AGG (#5338)


  Commit: 93cc1edab40ed0e32c46beb3a22e881c08f00952
      https://github.com/mapserver/mapserver/commit/93cc1edab40ed0e32c46beb3a22e881c08f00952
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M maplexer.c
    M maplexer.l

  Log Message:
  -----------
  Allow FEATURE->ITEMS to be set by URL (#5335)


  Commit: 2ab0dc0187b0a89560d5ce88c1e1208a3def6108
      https://github.com/mapserver/mapserver/commit/2ab0dc0187b0a89560d5ce88c1e1208a3def6108
  Author: geographika <geographika>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M maputfgrid.cpp

  Log Message:
  -----------
  Fix utfgrid text encoding to work with Windows (#5342)


  Commit: bcf7e7ef350abe8649b4ca1834d163912c3f5fc2
      https://github.com/mapserver/mapserver/commit/bcf7e7ef350abe8649b4ca1834d163912c3f5fc2
  Author: Alexander Gabriel <alexander.gabriel at digital-infinity.de>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  Fix LNK2019 build error on windows (#5346)

Fixes error in maphttp.c.obj LNK2019  unresolved external symbol
"__imp__select at 20" in function "_msHTTPExecuteRequests"


  Commit: 2f240de9ac97c1e7cc3253541b590a45271a334d
      https://github.com/mapserver/mapserver/commit/2f240de9ac97c1e7cc3253541b590a45271a334d
  Author: Alexander Gabriel <alexander.gabriel at digital-infinity.de>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M mapscript/php/owsrequest.c

  Log Message:
  -----------
  Fix variable declaration compilation error on Windows (#5346)


  Commit: 54d645c18d0293f7e5821e9d740542408083f955
      https://github.com/mapserver/mapserver/commit/54d645c18d0293f7e5821e9d740542408083f955
  Author: Alexander Gabriel <alexander.gabriel at digital-infinity.de>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M cmake/FindPHP5.cmake
    M mapscript/php/CMakeLists.txt

  Log Message:
  -----------
  fix issues when compiling PHP-MapScript with VS2012 Express (#5346)


  Commit: 14ce31235fe9400275114666673ab7013006663c
      https://github.com/mapserver/mapserver/commit/14ce31235fe9400275114666673ab7013006663c
  Author: Alexander Gabriel <alexander.gabriel at digital-infinity.de>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M cmake/FindICONV.cmake

  Log Message:
  -----------
  cmake/FindICONV.cmake did not find iconv on windows (#5346)


  Commit: 7413952a17f826926066fa46dbc2c784117c5068
      https://github.com/mapserver/mapserver/commit/7413952a17f826926066fa46dbc2c784117c5068
  Author: Martin Kofahl <martin.kofahl at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M maplayer.c
    M mapserver.h

  Log Message:
  -----------
  Free expression tokens, which may store an index to an iteminfo, when iteminfo is freed. (#5161)


  Commit: 3392ca15f3aee0806b8ca0cae056e3c9bbc704a9
      https://github.com/mapserver/mapserver/commit/3392ca15f3aee0806b8ca0cae056e3c9bbc704a9
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  update for 6.4.4 release


  Commit: f792a9de2dd781644b66497b593e9e21d40478f0
      https://github.com/mapserver/mapserver/commit/f792a9de2dd781644b66497b593e9e21d40478f0
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Log Message:
  -----------
  Merge branch 'branch-6-4' into branch-7-0


  Commit: 0f9ece882a48a286f933a17aa40880073df93aac
      https://github.com/mapserver/mapserver/commit/0f9ece882a48a286f933a17aa40880073df93aac
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2016-12-05 (Mon, 05 Dec 2016)

  Changed paths:
    M CMakeLists.txt

  Log Message:
  -----------
  update for 7.0.3 release


  Commit: 153471013be25562ebb3d83f17b7312834e3a4fd
      https://github.com/mapserver/mapserver/commit/153471013be25562ebb3d83f17b7312834e3a4fd
  Author: Alexander Gabriel <github684354 at digital-infinity.de>
  Date:   2016-12-07 (Wed, 07 Dec 2016)

  Changed paths:
    M README.WIN32
    M mapscript/php/README.WIN32

  Log Message:
  -----------
  Update README.WIN32 for Mapserver and PHP/MapScript (#5357)


  Commit: 6beab5e455fd4d0c4292bd5cf77655617a1dae2f
      https://github.com/mapserver/mapserver/commit/6beab5e455fd4d0c4292bd5cf77655617a1dae2f
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M mapogcfilter.c
    M mapogr.cpp
    M mapwfs.c

  Log Message:
  -----------
  WFS: fix taking into account of wfs_use_default_extent_for_getfeature. Logic added in 7.0.3 was inverted...


  Commit: 50a62352e7a75e9b717d0c8c952a1cf45ae38c32
      https://github.com/mapserver/mapserver/commit/50a62352e7a75e9b717d0c8c952a1cf45ae38c32
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M README.WIN32
    M cmake/FindICONV.cmake
    M cmake/FindPHP5.cmake
    M fontcache.c
    M maplayer.c
    M maplexer.c
    M maplexer.l
    M mapogcfilter.c
    M mapogr.cpp
    M mappostgis.c
    M mapscript/php/CMakeLists.txt
    M mapscript/php/README.WIN32
    M mapscript/php/error.c
    M mapscript/php/owsrequest.c
    M mapserver.h
    M maputfgrid.cpp
    M mapwfs.c

  Log Message:
  -----------
  Merge branch 'branch-7-0'


Compare: https://github.com/mapserver/mapserver/compare/30cb772ed112...50a62352e7a7