Merge remote-tracking branch 'origin/develop-8.1' into merge-develop_8.1_13.11.17

livecodeali · livecodeali · commit a0af6c25eb2f · 2017-11-13T16:05:27.000Z
diff --git a/buildbot.mk b/buildbot.mk
@@ -121,7 +121,7 @@ dist-docs-guide:
 		--stage guide --warn-as-error
 
 ifeq ($(BUILD_EDITION),commercial)
-dist-server: dist-server-commercial
+dist-server: dist-server-indy dist-server-business
 endif
 
 dist-server: dist-server-community
@@ -130,10 +130,14 @@ dist-server-community:
 	$(buildtool_command) --platform mac --platform win --platform linux \
 	    --stage server --edition community --warn-as-error
 
-dist-server-commercial:
+dist-server-indy:
 	$(buildtool_command) --platform mac --platform win --platform linux \
-	    --stage server --edition commercial --warn-as-error
+	    --stage server --edition indy --warn-as-error
 
+dist-server-business:
+	$(buildtool_command) --platform mac --platform win --platform linux \
+		--stage server --edition business --warn-as-error
+		
 ifeq ($(BUILD_EDITION),commercial)
 dist-tools: dist-tools-commercial
 distmac-disk: distmac-disk-communityplus distmac-disk-indy distmac-disk-business
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -1,7 +1,7 @@
 ﻿script "BuilderUtilities"
 
 constant kMergExtVersion = "2017-11-3"
-constant kTSNetVersion = "1.3.2"
+constant kTSNetVersion = "1.3.3"
 
 local sEngineDir
 local sWorkDir
diff --git a/builder/server_builder.livecodescript b/builder/server_builder.livecodescript
@@ -109,18 +109,25 @@ command serverBuilderRun pPlatform, pEdition
          end if
       end repeat
       
-      if pEdition is "Community" then
-         get tEngineFolder & slash & "server-community" & tExeExtension
-      else
-         get tEngineFolder & slash & "server-commercial" & tExeExtension
-      end if
-      if there is a file it then
+      local tServerPath, tServerZipPath
+      switch pEdition
+      case "Community"
+         put tEngineFolder & slash & "server-community" & tExeExtension into tServerPath
+         put "livecode-community-server" & tOutExeExtension into tServerZipPath
+         break
+      case "Indy"
+         put tEngineFolder & slash & "server-commercial" & tExeExtension into tServerPath
+         put "livecode-server" & tOutExeExtension into tServerZipPath
+         break
+      case "Business"
+         put tEngineFolder & slash & "server-professional" & tExeExtension into tServerPath
+         put "livecode-server" & tOutExeExtension into tServerZipPath
+         break
+      end switch
+      
+      if there is a file tServerPath then
          builderLog "message", "Adding livecode-server engine"
-         if pEdition is "Community" then
-            revZipAddItemWithFile tOutputFile, "livecode-community-server" & tOutExeExtension, it
-         else
-            revZipAddItemWithFile tOutputFile, "livecode-server" & tOutExeExtension, it
-         end if
+         revZipAddItemWithFile tOutputFile, tServerZipPath, tServerPath
          if the result is not empty then
             throw the result
          end if
@@ -183,9 +190,5 @@ function getZipFilenameStub pVersion, pPlatform, pEdition
    else if pPlatform is "linux-armv6hf" then
       put "Linux-armv6hf" into pPlatform
    end if
-   if pEdition is "Community" then
-      return "LiveCodeCommunityServer-" & pVersion & "-" & pPlatform & ".zip"
-   else
-      return "LiveCodeServer-" & pVersion & "-" & pPlatform & ".zip"
-   end if
+   return "LiveCode" & editionTitleCase(pEdition) & "Server-" & pVersion & "-" & pPlatform & ".zip"
 end getZipFilenameStub
diff --git a/builder/tools_builder.livecodescript b/builder/tools_builder.livecodescript
@@ -199,6 +199,7 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
    packageCompilerConfigureSource tPackager, "prebuilt", builderRepoFolder() & slash & "prebuilt"
    packageCompilerConfigureSource tPackager, "repo", builderRepoFolder()
    packageCompilerConfigureSource tPackager, "ext", builderUnpackFolder(pEdition)
+
    if editionIsInPrivateRepo(tEditionType) then
       packageCompilerConfigureSource tPackager, "private", builderPrivateRepoFolder()
    end if
diff --git a/docs/notes/bugfix-20628.md b/docs/notes/bugfix-20628.md
@@ -0,0 +1 @@
+# Add tsNet builds for iOS SDK 11.1
diff --git a/docs/notes/bugfix-20654.md b/docs/notes/bugfix-20654.md
@@ -0,0 +1 @@
+# Fix crash when trying to write to a disconnected socket
diff --git a/engine/src/opensslsocket.cpp b/engine/src/opensslsocket.cpp
@@ -763,6 +763,11 @@ MCSocket *MCS_open_socket(MCNameRef name, Boolean datagram, MCObject *o, MCNameR
 		MCresult->sets("can't create socket");
 		return NULL;
 	}
+    
+#ifdef SO_NOSIGPIPE
+    int set = 1;
+    setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
+#endif
 
 	// HH-2017-01-26: [[ Bug 18454 ]] Set the broadcast flagged base on property 'allowDatagramBroadcasts'
 	if(datagram)
@@ -1078,6 +1083,11 @@ MCSocket *MCS_accept(uint2 port, MCObject *object, MCNameRef message, Boolean da
 		MCresult->sets("can't create socket");
 		return NULL;
 	}
+    
+#ifdef SO_NOSIGPIPE
+    int set = 1;
+    setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
+#endif
 
 	unsigned long val = 1;
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix crash when trying to write to a disconnected socket`