[mapserver-commits] [mapserver/mapserver] 166567: Fix PHP building when GD is disabled. Closes #4550

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: 1665673e5ef133c91dd003fc81c96e0c6a7985d2
      https://github.com/mapserver/mapserver/commit/1665673e5ef133c91dd003fc81c96e0c6a7985d2
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2013-03-28 (Thu, 28 Mar 2013)

  Changed paths:
    M mapscript/php/mapscript_i.c

  Log Message:
  -----------
  Fix PHP building when GD is disabled. Closes #4550


  Commit: 1fbded63e14b038dfdc5d3fcfe6cd3db5cfecc5e
      https://github.com/mapserver/mapserver/commit/1fbded63e14b038dfdc5d3fcfe6cd3db5cfecc5e
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2013-03-28 (Thu, 28 Mar 2013)

  Changed paths:
    M mapcairo.c

  Log Message:
  -----------
  Merge branch 'branch-6-2' of github.com:mapserver/mapserver into branch-6-2


  Commit: 484e28c1fc3fd7660d68bb4f0a892397fa5d444a
      https://github.com/mapserver/mapserver/commit/484e28c1fc3fd7660d68bb4f0a892397fa5d444a
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2013-03-29 (Fri, 29 Mar 2013)

  Changed paths:
    M cgiutil.c

  Log Message:
  -----------
  ignore additional encodings in received content-type headers (#4585)

closes #4585


  Commit: 6e9dec9f2fe59edf3409a345f37be2f6b4c79535
      https://github.com/mapserver/mapserver/commit/6e9dec9f2fe59edf3409a345f37be2f6b4c79535
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M MIGRATION_GUIDE.txt
    M mapfile.c
    M maplexer.c
    M maplexer.l
    M mapscript/php/mapscript_i.c
    M mapscript/swiginc/label.i
    M mapserver.h

  Log Message:
  -----------
  fix cgi label commands after multi-label changes (#4621)


  Commit: dc283b2ccd57125cafe34685d0061fdcbfe6d8a4
      https://github.com/mapserver/mapserver/commit/dc283b2ccd57125cafe34685d0061fdcbfe6d8a4
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M cgiutil.c
    M mapfile.c
    M maplexer.c
    M maplexer.l
    M mapscript/php/mapscript_i.c
    M mapscript/swiginc/label.i
    M mapserver.h

  Log Message:
  -----------
  Merge branch 'branch-6-2'

Conflicts:
	MIGRATION_GUIDE.txt
	maplexer.c


Compare: https://github.com/mapserver/mapserver/compare/1e243f96d18b...dc283b2ccd57