Overview
| Comment: | Merged fork and fixed merge conflict |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 |
| Files: | files | file ages | folders |
| SHA1: |
965c3fa0774eee49c5d8a6b128cf820a |
| User & Date: | mrwellan on 2019-07-31 16:55:31 |
| Other Links: | branch diff | manifest | tags |
Context
|
2019-08-08
| ||
| 10:23 | Merging inode branch check-in: 00665c4940 user: jmoon18 tags: v1.65 | |
|
2019-07-31
| ||
| 16:55 | Merged fork and fixed merge conflict check-in: 965c3fa077 user: mrwellan tags: v1.65 | |
|
2019-07-22
| ||
| 15:05 | Merged in inodes fixes, fixed typos, and updated makefile to help with make clean check-in: 059415e777 user: jmoon18 tags: v1.65 | |
|
2019-07-12
| ||
| 15:12 | Changed login failed to login unsuccessfull check-in: f7a5f0b8f1 user: mrwellan tags: v1.65 | |
Changes
Modified client.scm from [eb49830f7c] to [e77217956b].
| ︙ | ︙ | |||
101 102 103 104 105 106 107 | (if (and start-res ping-res) (let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago (remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res) (debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res)) start-res) (begin ;; login failed but have a server record, clean out the record and try again | | | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | (if (and start-res ping-res) (let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago (remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res) (debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res)) start-res) (begin ;; login failed but have a server record, clean out the record and try again (debug:print-info 0 *default-log-port* "client:setup, login unsuccessful, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid. Fixes part of Randy;s ticket 1405717332 (case *transport-type* ((http)(http-transport:close-connections))) (remote-conndat-set! runremote #f) ;; (hash-table-delete! runremote run-id) (thread-sleep! 1) (client:setup-http areapath remaining-tries: (- remaining-tries 1)) ))) (begin ;; no server registered |
| ︙ | ︙ |