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

Commit 771e4b6

Browse files
committed
Merge branch 'develop' into feature-center_rect
Conflicts: engine/src/control.cpp engine/src/graphicscontext.cpp
2 parents 05b500e + 0b9c4e3 commit 771e4b6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1386
-1438
lines changed

docs/dictionary/command/open-socket.xml

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/dictionary/command/secure-socket.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<doc> <legacy_id></legacy_id> <name>secure socket</name> <type>command</type> <syntax> <example>secure socket <i>socket</i> [width|without verification]</example> </syntax> <synonyms> </synonyms> <summary>Secures an open socket.</summary> <examples><example>secure socket "runrev.com:443"</example><example>open socket to "127.0.0.0:8080"write "unencrypted message" to socket "127.0.0.0:8080"secure socket "127.0.0.0:8080"write "encrypted message" to socket "127.0.0.0:8080"</example> </examples> <history> <introduced version="6.6">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> </platforms> <classes> <desktop/> </classes> <security> <network/> </security> <classification> <category>Files, Folders, &amp; Resources</category> <category>Standalone Applications</category> </classification> <references> <command tag="open socket">open socket Command</command> <property tag="sslCertificates">sslCertificates Property</property> <message tag="socketError">socketError Message</message> </references> <description> <overview>Use the <b>secure socket </b>command to secure an open socket.</overview> <parameters><parameter><name>socket</name><description>A reference to an open socket.</description></parameter> </parameters> <value></value> <comments>If 'with verification' is specified, when connecting to a remote peer, the client verifies the peers certificate during the handshake process. The <property tag="sslCertificates">sslCertificates property</property> can be used to specify a list of certificates to verify against. In addition you can place system wide certificates in System/Library/OpenSSL/certs.<p></p><p>If 'without verification' is specified then peers credentials are not authenticated, and any connection is accepted.</p><p></p><p>Once secured:</p><p>* All pending and future reads from the socket will be assumed to be encrypted.</p><p>* All pending writes will complete unencrypted. All future writes will be encrypted.</p><p></p><p>If the socket fails secure, a <message tag="socketError">socketError message</message> is sent to the object that opened the socket (not the object that attempted to secure it).</p><p></p><p><important> The secure secure socket command is part of the SSL &amp; Encryption library. To ensure that the command works in a standalone application, you must include this custom library when you create your standalone. In the Inclusions section on the General screen of the Standalone Application Settings window, make sure "SSL &amp; Encryption" is selected in the list of script libraries.</important></comments> </description></doc>
1+
<doc> <legacy_id></legacy_id> <name>secure socket</name> <type>command</type> <syntax> <example>secure socket <i>socket</i> [without verification]</example> <example>secure socket <i>socket</i> [with verification [for host verificationHostName]]</example> </syntax> <synonyms> </synonyms> <summary>Secures an open socket.</summary> <examples><example>secure socket "runrev.com:443"</example><example>open socket to "127.0.0.0:8080"write "unencrypted message" to socket "127.0.0.0:8080"secure socket "127.0.0.0:8080"write "encrypted message" to socket "127.0.0.0:8080"</example><example>secure socket mySocket with verifcation for host "livecode.com"</example> </examples> <history> <introduced version="6.6">Added.</introduced> <deprecated version=""></deprecated> <removed version=""></removed> <changed version="6.7">Added verification for host variant</changed> <experimental version=""></experimental> <nonexperimental version=""></nonexperimental> </history> <objects> </objects> <platforms> <mac/> <windows/> <linux/> </platforms> <classes> <desktop/> </classes> <security> <network/> </security> <classification> <category>Files, Folders, &amp; Resources</category> <category>Standalone Applications</category> </classification> <references> <command tag="open socket">open socket Command</command> <property tag="sslCertificates">sslCertificates Property</property> <message tag="socketError">socketError Message</message> </references> <description> <overview>Use the <b>secure socket </b>command to secure an open socket.</overview> <parameters> <parameter> <name>socket</name> <description>A reference to an open socket.</description> </parameter> <parameter> <name>verificationHostName</name> <description>The IP address or domain name of the host you want to verify against.</description> </parameter> </parameters> <value></value> <comments>If 'with verification' is specified, when connecting to a remote peer, the client verifies the peers certificate during the handshake process. The <property tag="sslCertificates">sslCertificates property</property> can be used to specify a list of certificates to verify against. In addition you can place system wide certificates in System/Library/OpenSSL/certs. If a verificationhostname is specified, the socket will be verified against that verificationhostname. An example of this is when you want to create a secure connection with a host while tunnelling through a proxy. Specifying the final host allows LiveCode to verify the socket against that host, rather than the proxy server.<p></p><p>If 'without verification' is specified then peers credentials are not authenticated, and any connection is accepted.</p><p></p><p>Once secured:</p><p>* All pending and future reads from the socket will be assumed to be encrypted.</p><p>* All pending writes will complete unencrypted. All future writes will be encrypted.</p><p></p><p>If the socket fails secure, a <message tag="socketError">socketError message</message> is sent to the object that opened the socket (not the object that attempted to secure it).</p><p></p><p></p><important> The secure secure socket command is part of the SSL &amp; Encryption library. To ensure that the command works in a standalone application, you must include this custom library when you create your standalone. In the Inclusions section on the General screen of the Standalone Application Settings window, make sure "SSL &amp; Encryption" is selected in the list of script libraries.</important><p>&#9;</p></comments> </description></doc>

docs/notes/bugfix-12557.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Images can draw incorrectly depending on coordinates.
2-
3-
Adjacent objects on a stack can sometimes be drawn with a gap between them when drawn at non-integer scales (For instance, on a Windows desktop with text scaling set to 150%). To address this issue we have tweaked the drawing code to ensure that control rects are aligned to integer device coordinates, which will eliminate this problem.
1+
# Objects which are adjacent don't necessary appear so at non integral scale factors.
2+
At non-integral scale factors (such as 150% Hi-DPI mode on Windows), objects which should appear next to each other can have a visible channel.
3+
This issue isn't completely fixable due to the nature of approximations used when compositing to the screen. However, this problem has been mitigated in a couple of ways - firstly antialiasing is forced on whenever the scale factor is non-integral; secondly clipping rectangles always fall on device pixel boundaries.

docs/notes/bugfix-12567.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Connecting to an HTTPS URL via a proxy fails if libURLSetVerification is true

docs/notes/bugfix-12612.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Use sub-pixel positioning for laying out text within fields

docs/notes/bugfix-12646.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Crash when fetching the alphadata of a resized image

docs/notes/bugfix-12648.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Shell command does not accept spaces despite being quoted (Windows)

docs/notes/bugfix-12669.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# WebAuthenticationPanel class in OSX revbrowser conflicts with same class in WebKit library

docs/notes/feature-coretext.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ In order to improve performance, the text rendering routines for iOS and OS X an
55
It's worth noting that the previous OS X routines used synthesised font styles. That is, bold and italic styles were emulated (by slanting or thickening) if the font being rendered was not bold or italic. This is not the case for the new routines. If there is not a font present on the system with the given style, the plain alternative will be used.
66

77
The is the case with the default font - Lucida Grande. By default, systems only come with the bold variant. Thus, if you have a field with the default font and italic style, it will be rendered in plain style.
8+
9+
As part of LiveCodes progression toward unicode, the use of older symbol fonts is no longer fully supported. In order to ensure symbol fonts are drawn correctly, the font must be unicode encoded. The fonts that come with the latest versions of OS X are all unicode encoded.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# New variant of open and secure socket
2+
3+
New variants of open and secure socket have been added:
4+
5+
**open secure socket** *socket* **with verification for host** *host*
6+
7+
**secure socket** *socket* **with verification for host** *host*
8+
9+
The new host parameter allows the user to specify the host name the connection should be verified against. This is particularly useful if server your socket is directly connected to is not the end host you are talking to. For example when tunnelling through a proxy to connect to a HTTPS URL.

0 commit comments

Comments
 (0)