mike-jumper opened a new pull request, #867:
URL: https://github.com/apache/guacamole-client/pull/867
This change reapplies the same commits from #710 against `staging/1.5.2`.
**NOTE:** Similar to #858, there will be a trivial merge conflict against
`indexController.js` upon merging back to `master`:
```
<<<<<<< HEAD
/**
* The number of milliseconds that should elapse between client-side
* session checks. This DOES NOT impact whether a session expires at all;
* such checks will always be server-side. This only affects how quickly
* the client-side view can recognize that a user's session has expired
* absent any action taken by the user.
*
* @type {!number}
*/
const SESSION_VALIDITY_RECHECK_INTERVAL = 15000;
// Required types
const Error = $injector.get('Error');
const ManagedClientState = $injector.get('ManagedClientState');
=======
// Required types
const Error = $injector.get('Error');
>>>>>>> test-merge-1.5.2
```
but this time there will also be a non-trivial conflict against
`tunnelService.js`:
```
<<<<<<< HEAD
// Resolve if last chunk or begin next chunk if HTTP status
// code indicates success.
if (xhr.status >= 200 && xhr.status < 300) {
offset += CHUNK_SIZE;
=======
// Parse and reject with resulting JSON error
else if (xhr.getResponseHeader('Content-Type') ===
'application/json')
deferred.reject(new
Error(angular.fromJson(xhr.responseText)));
>>>>>>> test-merge-1.5.2
```
Ultimately, the result of merging things back to `master` _should_ be
identical to what is already on `master`, as these changes were originally
merged to `master` in the first place.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
