[mapguide-commits] r8429 - in trunk/Installer: . Support/Web/x64 Support/Web/x64/configs/Apache2/conf Support/Web/x86 Support/Web/x86/configs/Apache2/conf

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-10-21 08:09:59 -0700 (Tue, 21 Oct 2014)
New Revision: 8429

Added:
   trunk/Installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
   trunk/Installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
   trunk/Installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
   trunk/Installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
Removed:
   trunk/Installer/Support/Web/x64/httpd-2.4.9-x64-VC11.zip
   trunk/Installer/Support/Web/x64/php-5.5.11-x64-VC11.zip
   trunk/Installer/Support/Web/x86/httpd-2.4.9-x86-VC11.zip
   trunk/Installer/Support/Web/x86/php-5.5.11-x86-VC11.zip
Modified:
   trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf
   trunk/Installer/Support/Web/x64/mod_jk.so
   trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf
   trunk/Installer/Support/Web/x86/mod_jk.so
   trunk/Installer/build.bat
Log:
RFC 147: Update binary distributions for installer. For this release, httpd somehow won't pick up libssh2.dll under current configuration (unless PHP directory is in the PATH environment variable). We fix that by pre-loading this dll in httpd.conf

Modified: trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf
===================================================================
--- trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf	2014-10-20 06:07:33 UTC (rev 8428)
+++ trunk/Installer/Support/Web/x64/configs/Apache2/conf/httpd.conf	2014-10-21 15:09:59 UTC (rev 8429)
@@ -121,6 +121,7 @@
 Listen %MG_WEB_PORT%
 
 LoadFile "%MG_WEB_PHP%/php5ts.dll"
+LoadFile "%MG_WEB_PHP%/libssh2.dll"
 LoadFile "%MG_WEB_PHP%/ACE.dll"
 LoadFile "%MG_WEB_PHP%/MgHttpHandler.dll"
 LoadFile "%MG_WEB_PHP%/MgFoundation.dll"

Added: trunk/Installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
===================================================================
(Binary files differ)


Property changes on: trunk/Installer/Support/Web/x64/httpd-2.4.10-x64-VC11.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/Installer/Support/Web/x64/httpd-2.4.9-x64-VC11.zip
===================================================================
(Binary files differ)

Modified: trunk/Installer/Support/Web/x64/mod_jk.so
===================================================================
(Binary files differ)

Deleted: trunk/Installer/Support/Web/x64/php-5.5.11-x64-VC11.zip
===================================================================
(Binary files differ)

Added: trunk/Installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
===================================================================
(Binary files differ)


Property changes on: trunk/Installer/Support/Web/x64/php-5.5.17-x64-VC11.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf
===================================================================
--- trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf	2014-10-20 06:07:33 UTC (rev 8428)
+++ trunk/Installer/Support/Web/x86/configs/Apache2/conf/httpd.conf	2014-10-21 15:09:59 UTC (rev 8429)
@@ -121,6 +121,7 @@
 Listen %MG_WEB_PORT%
 
 LoadFile "%MG_WEB_PHP%/php5ts.dll"
+LoadFile "%MG_WEB_PHP%/libssh2.dll"
 LoadFile "%MG_WEB_PHP%/ACE.dll"
 LoadFile "%MG_WEB_PHP%/MgHttpHandler.dll"
 LoadFile "%MG_WEB_PHP%/MgFoundation.dll"

Added: trunk/Installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
===================================================================
(Binary files differ)


Property changes on: trunk/Installer/Support/Web/x86/httpd-2.4.10-x86-VC11.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/Installer/Support/Web/x86/httpd-2.4.9-x86-VC11.zip
===================================================================
(Binary files differ)

Modified: trunk/Installer/Support/Web/x86/mod_jk.so
===================================================================
(Binary files differ)

Deleted: trunk/Installer/Support/Web/x86/php-5.5.11-x86-VC11.zip
===================================================================
(Binary files differ)

Added: trunk/Installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
===================================================================
(Binary files differ)


Property changes on: trunk/Installer/Support/Web/x86/php-5.5.17-x86-VC11.zip
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2014-10-20 06:07:33 UTC (rev 8428)
+++ trunk/Installer/build.bat	2014-10-21 15:09:59 UTC (rev 8429)
@@ -80,9 +80,9 @@
 rem ==================================================
 rem Web dependencies
 rem ==================================================
-SET HTTPD_VERSION=2.4.9
-SET PHP_VERSION=5.5.11
-SET TOMCAT_VERSION=7.0.42
+SET HTTPD_VERSION=2.4.10
+SET PHP_VERSION=5.5.17
+SET TOMCAT_VERSION=7.0.56
 SET HTTPD_PACKAGE=httpd-%HTTPD_VERSION%-%PLATFORM_CLR%-VC11.zip
 SET TOMCAT_PACKAGE_NAME=apache-tomcat-%TOMCAT_VERSION%
 SET TOMCAT_PACKAGE=%MG_OEM%\LinuxApt\%TOMCAT_PACKAGE_NAME%.tar.gz