Changeset 15311

Timestamp:

06/04/20 08:25:19 (2 years ago)

Author:

Mark Evenson

Message:

ci: cl-plus-ssl now tests easye/stream-fd-20200603a

c.f. <​https://github.com/armedbear/cl-plus-ssl/tree/easye/stream-fd-20200603a>

Location:

trunk/abcl

Files:

• ci/install-cl+ssl.bash (modified) (1 diff)
• patches/cl-plus-ssl-abcl.patch (modified) (3 diffs)

trunk/abcl/ci/install-cl+ssl.bash

@@ -4 +4 @@
 uri="https://github.com/armedbear/${dir}"
 root="${HOME}/quicklisp/local-projects"
-tag="easye/openjdk14"
+tag="easye/stream-fd-20200603a"
 
 mkdir -p ${root}

trunk/abcl/patches/cl-plus-ssl-abcl.patch

@@ -1 +1 @@
 # HG changeset patch
+# User Anton Vodonosov <avodonosov@yandex.ru>
+# Date 1591183464 -10800
+#      Wed Jun 03 14:24:24 2020 +0300
+# Node ID fa084b0f7b141aad916af88f1dbc24dbbe1153a5
 # Parent  e997fa4665748951d229e8622102c67fca5f22f9
-abcl: fix getting the underlying stream fd for openjdk14
+# Parent  ed980cfac3a263beb45a189d5e546df84f24011e
 
-diff -r e997fa466574 -r 58f46634d03d src/streams.lisp
+abcl: fix accessing underlying fd with openjdk8 and openjdk14
+
+Merged as <https://github.com/cl-plus-ssl/cl-plus-ssl/pull/103>
+
+diff -r e997fa466574 -r fa084b0f7b14 src/streams.lisp
 --- a/src/streams.lisp  Wed May 27 17:20:38 2020 +0300
-+++ b/src/streams.lisp  Sat May 30 08:30:17 2020 +0200
-@@ -493,18 +493,25 @@
++++ b/src/streams.lisp  Wed Jun 03 14:24:24 2020 +0300
+@@ -493,18 +493,26 @@
    (require :jss)
  
@@ -20 +28 @@
 +  ;;; SSL.
    (defmethod stream-fd ((stream system::socket-stream))
-+    (setf *debug* stream)
      (flet ((get-java-fields (object fields) ;; Thanks to Cyrus Harmon
               (reduce (lambda (x y)
@@ -28 +35 @@
 +                     :initial-value object))
 +           (jvm-version ()
-+             (parse-integer (java:jstatic "getProperty" "java.lang.System"
-+                                          "java.specification.version"))))
++             (read
++              (make-string-input-stream
++               (java:jstatic "getProperty" "java.lang.System"
++                                          "java.specification.version")))))
        (ignore-errors
         (get-java-fields (java:jcall "getWrappedInputStream"  ;; TODO: define this as a constant