Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 4e36a32

Browse files
livecodesebastienlivecodesebastien
committed
Merge remote-tracking branch 'origin/release-6.7.8' into release-7.1.1
Clean merge. ide submodule updated to the HEAD of release-7.1.1 Conflicts: ide
2 parents 9046211 + 9172dce commit 4e36a32

10 files changed

Lines changed: 32 additions & 15 deletions

‎builder/server_builder.livecodescript‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,9 @@ command serverBuilderRun pPlatform, pEdition
3737
delete file tOutputFile
3838

3939
if pPlatform is "windows" then
40-
local tExternalsFolder
41-
put tEngineFolder into tExternalsFolder
42-
set the itemDel to slash
43-
put "releaseserver" into the last item of tExternalsFolder
44-
set the itemDel to comma
45-
4640
repeat for each word tExternal in "revdb revzip revxml dbsqlite dbmysql dbpostgresql dbodbc"
4741
get "server-" & tExternal & ".dll"
48-
if there is a file (tExternalsFolder & slash & it) then
49-
builderLog "message", "Copying windows external '" & tExternal & "' from release server folder"
50-
put URL ("binfile:" & tExternalsFolder & slash & it) into URL ("binfile:" & tEngineFolder & slash & it)
51-
else
42+
if there is not a file (tEngineFolder & slash & it) then
5243
get tExternal & ".dll"
5344
if there is a file (tEngineFolder & slash & it) then
5445
builderLog "message", "Copying windows external '" & tExternal & "' from desktop external"

‎config/ios.gypi‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@
2929
'IPHONEOS_DEPLOYMENT_TARGET[arch=i386]': '5.1.1',
3030
'IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]': '7.0.0',
3131
'IPHONEOS_DEPLOYMENT_TARGET[arch=x86_64]': '7.0.0',
32-
'ENABLE_BITCODE[arch=armv7]': 'No',
33-
'ENABLE_BITCODE[arch=i386]': 'No',
34-
'ENABLE_BITCODE[arch=arm64]': 'Yes',
35-
'ENABLE_BITCODE[arch=x86_64]': 'Yes',
32+
'ENABLE_BITCODE': 'No',
3633
'TARGETED_DEVICE_FAMILY': '1,2',
3734
'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
3835
'ARCHS_STANDARD': 'armv7 arm64',

‎docs/notes/bugfix-16268.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Use the server-revdb.dll external for Windows server
2+

‎docs/notes/bugfix-16299.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Unable to mobileControlSet URL with http:// URL on iOS 9.1 Simulators and Devices

‎docs/notes/feature-ats.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Application Transport Security (ATS)
2+
3+
Apple introduced in iOS SDK 9.0 the Application Transport Security which 'enforces best practices in the secure connections between an app and its back end' (see [the technical notice](https://developer.apple.com/library/prerelease/ios/releasenotes/General/WhatsNewIniOS/Articles/iOS9.html#//apple_ref/doc/uid/TP40016198-SW14)).
4+
5+
The most noticeable effect on applications created using Xcode 7.0 (and following versions) is that URLs using *HTTP* protocol are no longer considered valid, and the iOS engine will not process them; only URLs using *HTTPS* are deemed secure enough, and will be loaded.
6+
7+
This means that `nativeBrowser` cannot load a webpage such as [http LiveCode](http://www.livecode.com), but will happily load [https LiveCode](https://www.livecode.com). The same applies to the LiveCode function *url*.
8+
9+
To allow our users to create apps letting Web navigation accept unsecure webpages, we added a checkbox **Disable ATS** in the Standalone Settings for iOS, in the Requirements and Restrictions section. If you check this box, then *ATS* will be disabled, and the application can load Webpages using *HTTP* (as it used to do).

‎engine/rsrc/mobile-device-template.plist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<array>
6363
${DEVICE_SUPPORT}
6464
</array>
65+
${DISABLE_ATS}
6566
<key>UIRequiredDeviceCapabilities</key>
6667
<dict>
6768
${DEVICE_CAPABILITY}

‎engine/rsrc/mobile-disable-ats-template.plist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<key>NSAppTransportSecurity</key>
2+
<dict>
3+
<key>NSAllowsArbitraryLoads</key><true/>
4+
</dict>

‎engine/rsrc/mobile-template.plist‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<array>
2222
${BUNDLE_ICONS}
2323
</array>
24+
${DISABLE_ATS}
2425
<key>CFBundleDisplayName</key>
2526
${BUNDLE_DISPLAY_NAME_SUPPORT}
2627
<key>MinimumOSVersion</key>

‎ide‎

Submodule ide updated from f4f7f38 to 8049003

‎ide-support/revsaveasiosstandalone.livecodescript‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,6 +1197,7 @@ private command revCreateMobilePlist pSettings, pAppBundle, pTarget, pFonts, pPl
11971197
----------
11981198

11991199
local tDisplayName, tMinimumOS, tDeviceFamily, tRequiredCapabilities, tPersistentWifi, tExitsOnSuspend
1200+
local tDisableATS
12001201
local tFileSharing, tPrerenderedIcon, tBackGroundAudio
12011202
put pSettings["ios,display name"] into tDisplayName
12021203
put pSettings["ios,minimum version"] into tMinimumOS
@@ -1236,6 +1237,12 @@ private command revCreateMobilePlist pSettings, pAppBundle, pTarget, pFonts, pPl
12361237
put "true" into tExitsOnSuspend
12371238
end if
12381239

1240+
// SN-2015-02-11: [[ Bug 16299 ]] Add ${DISABLE_ATS} in the Plist template
1241+
if pSettings["ios,disable ATS"] then
1242+
put URL("binfile:" & mapFilePath("DisableATS.plist")) into tDisableATS
1243+
end if
1244+
1245+
12391246
----------
12401247
-- PM-2015-02-17: [[ Bug 14482 ]] Added a new "solid" statusbarstyle
12411248
local tStatusBarHidden, tStatusBarStyle, tIPadStatusBarHidden, tStatusBarSolid
@@ -1316,6 +1323,7 @@ private command revCreateMobilePlist pSettings, pAppBundle, pTarget, pFonts, pPl
13161323
-- SN-2015-02-02: [[ Bug 14422 ]] We now have minimum version depending on the arch.
13171324
replace "${MINIMUM_OS_SUPPORT}" with "<string>" & tMinimumOSByArch["i386"] & "</string>" in pPlist
13181325
replace "${CUSTOM_FONTS}" with tCustomFonts in pPlist
1326+
replace "${DISABLE_ATS}" with tDisableATS in pPlist
13191327

13201328
get empty
13211329
repeat for each item tItem in tDeviceFamily
@@ -1637,6 +1645,9 @@ function mapFilePath pPath
16371645
case "BetaReportEntitlement.xcent"
16381646
put tRepo & slash & "engine/rsrc/template-beta-report-entitlement.xcent" into tPath
16391647
break
1648+
case "DisableATS.plist"
1649+
put tRepo & slash & "engine/rsrc/mobile-disable-ats-template.plist" into tPath
1650+
break
16401651
case "RemoteNotificationSettings.plist"
16411652
put tRepo & slash & "engine/rsrc/mobile-remote-notification-template.plist" into tPath
16421653
break

0 commit comments

Comments
 (0)