Changeset 15311


Ignore:
Timestamp:
06/04/20 08:25:19 (6 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/ci/install-cl+ssl.bash

    r15288 r15311  
    44uri="https://github.com/armedbear/${dir}"
    55root="${HOME}/quicklisp/local-projects"
    6 tag="easye/openjdk14"
     6tag="easye/stream-fd-20200603a"
    77
    88mkdir -p ${root}
  • trunk/abcl/patches/cl-plus-ssl-abcl.patch

    r15288 r15311  
    11# HG changeset patch
     2# User Anton Vodonosov <avodonosov@yandex.ru>
     3# Date 1591183464 -10800
     4#      Wed Jun 03 14:24:24 2020 +0300
     5# Node ID fa084b0f7b141aad916af88f1dbc24dbbe1153a5
    26# Parent  e997fa4665748951d229e8622102c67fca5f22f9
    3 abcl: fix getting the underlying stream fd for openjdk14
     7# Parent  ed980cfac3a263beb45a189d5e546df84f24011e
    48
    5 diff -r e997fa466574 -r 58f46634d03d src/streams.lisp
     9abcl: fix accessing underlying fd with openjdk8 and openjdk14
     10
     11Merged as <https://github.com/cl-plus-ssl/cl-plus-ssl/pull/103>
     12
     13diff -r e997fa466574 -r fa084b0f7b14 src/streams.lisp
    614--- a/src/streams.lisp  Wed May 27 17:20:38 2020 +0300
    7 +++ b/src/streams.lisp  Sat May 30 08:30:17 2020 +0200
    8 @@ -493,18 +493,25 @@
     15+++ b/src/streams.lisp  Wed Jun 03 14:24:24 2020 +0300
     16@@ -493,18 +493,26 @@
    917   (require :jss)
    1018 
     
    2028+  ;;; SSL.
    2129   (defmethod stream-fd ((stream system::socket-stream))
    22 +    (setf *debug* stream)
    2330     (flet ((get-java-fields (object fields) ;; Thanks to Cyrus Harmon
    2431              (reduce (lambda (x y)
     
    2835+                     :initial-value object))
    2936+           (jvm-version ()
    30 +             (parse-integer (java:jstatic "getProperty" "java.lang.System"
    31 +                                          "java.specification.version"))))
     37+             (read
     38+              (make-string-input-stream
     39+               (java:jstatic "getProperty" "java.lang.System"
     40+                                          "java.specification.version")))))
    3241       (ignore-errors
    3342        (get-java-fields (java:jcall "getWrappedInputStream"  ;; TODO: define this as a constant
Note: See TracChangeset for help on using the changeset viewer.