Skip to content

fix(xpc): honor request timeouts - #1965

Closed
stephenlclarke wants to merge 1 commit into
apple:mainfrom
stephenlclarke:fix/xpc-request-timeout
Closed

fix(xpc): honor request timeouts#1965
stephenlclarke wants to merge 1 commit into
apple:mainfrom
stephenlclarke:fix/xpc-request-timeout

Conversation

@stephenlclarke

@stephenlclarkestephenlclarke commented Jul 18, 2026

Copy link
Copy Markdown

Type of Change

  • Bug fix
  • New feature
  • Breaking change
  • Documentation update

Motivation and Context

apple/container#1927 documents a copy-out stall that can leave a container cp request waiting without a response. apple/containerization#799 addresses the guest-side lifecycle lock responsible for that stall. This PR makes the apple/container client's existing response timeout a reliable safeguard when a peer still does not reply.

XPCClient.send races a timeout task against an XPC reply task. The reply task waits in a checked continuation, but an XPC reply callback does not observe task cancellation. When the timeout wins, that continuation remained suspended and the task group continued to wait indefinitely.

This change uses a locked, one-shot continuation bridge: cancellation resumes it exactly once, and any later XPC reply is ignored. The scope is intentionally limited to cancellable request handling; it does not include the unrelated unknown-route behaviour proposed in #1862.

Testing

  • Tested locally
  • Added/updated tests
  • Added/updated docs (not needed: no public API or CLI behaviour changes)

Validation

  • swift test --disable-automatic-resolution -Xswiftc -warnings-as-errors --filter XPCClientTests — 5/5 passed. These exercise a real anonymous XPC endpoint: response timeout, direct caller cancellation, cancellation before continuation storage, client reuse, and late replies.
  • make test — passed: 570 tests in 71 suites (plus 94 XCTest cases).
  • make check — passed (Swift format and license-header checks).
  • git diff --check — passed.
  • make APP_ROOT=… LOG_ROOT=… SCRATCH_ROOT=… all integration — executed the VM integration suite. Warmup passed; the default-width run had three unrelated TCP-forwarding retries fail. Rerunning those three serially passed. A broader serial TestCLIRunCommand rerun was blocked before execution for its other cases because ghcr.io/linuxcontainers/alpine:3.20 was unavailable in the test environment.

Related

@stephenlclarke
fix(xpc): honor request timeouts
618d281
The XPC reply continuation did not observe task cancellation, so a configured client timeout could not complete until the server replied. Resume the continuation exactly once when cancellation wins and ignore late replies.
Refs: apple#1927
@stephenlclarke
stephenlclarke marked this pull request as ready for review July 22, 2026 21:13
@stephenlclarke
stephenlclarke deleted the fix/xpc-request-timeout branch August 3, 2026 07:12
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@stephenlclarke
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(xpc): honor request timeouts by stephenlclarke · Pull Request #1965 · apple/container · GitHub
Skip to content
fix(xpc): honor request timeouts - #1965
Closed
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Closed
fix(xpc): honor request timeouts#1965
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Conversation
@stephenlclarke
@stephenlclarkestephenlclarke
commented
Jul 18, 2026

Copy link


Copy Markdown

Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
apple/container#1927 documents a copy-out stall that can leave a container cp request waiting without a response. apple/containerization#799 addresses the guest-side lifecycle lock responsible for that stall. This PR makes the apple/container client's existing response timeout a reliable safeguard when a peer still does not reply.
XPCClient.send races a timeout task against an XPC reply task. The reply task waits in a checked continuation, but an XPC reply callback does not observe task cancellation. When the timeout wins, that continuation remained suspended and the task group continued to wait indefinitely.
This change uses a locked, one-shot continuation bridge: cancellation resumes it exactly once, and any later XPC reply is ignored. The scope is intentionally limited to cancellable request handling; it does not include the unrelated unknown-route behaviour proposed in #1862.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs (not needed: no public API or CLI behaviour changes)
Validation
  • swift test --disable-automatic-resolution -Xswiftc -warnings-as-errors --filter XPCClientTests — 5/5 passed. These exercise a real anonymous XPC endpoint: response timeout, direct caller cancellation, cancellation before continuation storage, client reuse, and late replies.
  • make test — passed: 570 tests in 71 suites (plus 94 XCTest cases).
  • make check — passed (Swift format and license-header checks).
  • git diff --check — passed.
  • make APP_ROOT=… LOG_ROOT=… SCRATCH_ROOT=… all integration — executed the VM integration suite. Warmup passed; the default-width run had three unrelated TCP-forwarding retries fail. Rerunning those three serially passed. A broader serial TestCLIRunCommand rerun was blocked before execution for its other cases because ghcr.io/linuxcontainers/alpine:3.20 was unavailable in the test environment.
Related
@stephenlclarke
fix(xpc): honor request timeouts
618d281
The XPC reply continuation did not observe task cancellation, so a configured client timeout could not complete until the server replied. Resume the continuation exactly once when cancellation wins and ignore late replies.
Refs: apple#1927
@stephenlclarke
stephenlclarke
marked this pull request as ready for review
July 22, 2026 21:13
@stephenlclarke
stephenlclarke
deleted the

fix/xpc-request-timeout

branch
August 3, 2026 07:12
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@stephenlclarke

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(xpc): honor request timeouts by stephenlclarke · Pull Request #1965 · apple/container · GitHub
Skip to content
fix(xpc): honor request timeouts - #1965
Closed
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Closed
fix(xpc): honor request timeouts#1965
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Conversation
@stephenlclarke
@stephenlclarkestephenlclarke
commented
Jul 18, 2026

Copy link


Copy Markdown

Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
apple/container#1927 documents a copy-out stall that can leave a container cp request waiting without a response. apple/containerization#799 addresses the guest-side lifecycle lock responsible for that stall. This PR makes the apple/container client's existing response timeout a reliable safeguard when a peer still does not reply.
XPCClient.send races a timeout task against an XPC reply task. The reply task waits in a checked continuation, but an XPC reply callback does not observe task cancellation. When the timeout wins, that continuation remained suspended and the task group continued to wait indefinitely.
This change uses a locked, one-shot continuation bridge: cancellation resumes it exactly once, and any later XPC reply is ignored. The scope is intentionally limited to cancellable request handling; it does not include the unrelated unknown-route behaviour proposed in #1862.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs (not needed: no public API or CLI behaviour changes)
Validation
  • swift test --disable-automatic-resolution -Xswiftc -warnings-as-errors --filter XPCClientTests — 5/5 passed. These exercise a real anonymous XPC endpoint: response timeout, direct caller cancellation, cancellation before continuation storage, client reuse, and late replies.
  • make test — passed: 570 tests in 71 suites (plus 94 XCTest cases).
  • make check — passed (Swift format and license-header checks).
  • git diff --check — passed.
  • make APP_ROOT=… LOG_ROOT=… SCRATCH_ROOT=… all integration — executed the VM integration suite. Warmup passed; the default-width run had three unrelated TCP-forwarding retries fail. Rerunning those three serially passed. A broader serial TestCLIRunCommand rerun was blocked before execution for its other cases because ghcr.io/linuxcontainers/alpine:3.20 was unavailable in the test environment.
Related
@stephenlclarke
fix(xpc): honor request timeouts
618d281
The XPC reply continuation did not observe task cancellation, so a configured client timeout could not complete until the server replied. Resume the continuation exactly once when cancellation wins and ignore late replies.
Refs: apple#1927
@stephenlclarke
stephenlclarke
marked this pull request as ready for review
July 22, 2026 21:13
@stephenlclarke
stephenlclarke
deleted the

fix/xpc-request-timeout

branch
August 3, 2026 07:12
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@stephenlclarke

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(xpc): honor request timeouts by stephenlclarke · Pull Request #1965 · apple/container · GitHub
Skip to content
fix(xpc): honor request timeouts - #1965
Closed
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Closed
fix(xpc): honor request timeouts#1965
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Conversation
@stephenlclarke
@stephenlclarkestephenlclarke
commented
Jul 18, 2026

Copy link


Copy Markdown

Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
apple/container#1927 documents a copy-out stall that can leave a container cp request waiting without a response. apple/containerization#799 addresses the guest-side lifecycle lock responsible for that stall. This PR makes the apple/container client's existing response timeout a reliable safeguard when a peer still does not reply.
XPCClient.send races a timeout task against an XPC reply task. The reply task waits in a checked continuation, but an XPC reply callback does not observe task cancellation. When the timeout wins, that continuation remained suspended and the task group continued to wait indefinitely.
This change uses a locked, one-shot continuation bridge: cancellation resumes it exactly once, and any later XPC reply is ignored. The scope is intentionally limited to cancellable request handling; it does not include the unrelated unknown-route behaviour proposed in #1862.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs (not needed: no public API or CLI behaviour changes)
Validation
  • swift test --disable-automatic-resolution -Xswiftc -warnings-as-errors --filter XPCClientTests — 5/5 passed. These exercise a real anonymous XPC endpoint: response timeout, direct caller cancellation, cancellation before continuation storage, client reuse, and late replies.
  • make test — passed: 570 tests in 71 suites (plus 94 XCTest cases).
  • make check — passed (Swift format and license-header checks).
  • git diff --check — passed.
  • make APP_ROOT=… LOG_ROOT=… SCRATCH_ROOT=… all integration — executed the VM integration suite. Warmup passed; the default-width run had three unrelated TCP-forwarding retries fail. Rerunning those three serially passed. A broader serial TestCLIRunCommand rerun was blocked before execution for its other cases because ghcr.io/linuxcontainers/alpine:3.20 was unavailable in the test environment.
Related
@stephenlclarke
fix(xpc): honor request timeouts
618d281
The XPC reply continuation did not observe task cancellation, so a configured client timeout could not complete until the server replied. Resume the continuation exactly once when cancellation wins and ignore late replies.
Refs: apple#1927
@stephenlclarke
stephenlclarke
marked this pull request as ready for review
July 22, 2026 21:13
@stephenlclarke
stephenlclarke
deleted the

fix/xpc-request-timeout

branch
August 3, 2026 07:12
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@stephenlclarke

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(xpc): honor request timeouts by stephenlclarke · Pull Request #1965 · apple/container · GitHub
Skip to content
fix(xpc): honor request timeouts - #1965
Closed
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Closed
fix(xpc): honor request timeouts#1965
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Conversation
@stephenlclarke
@stephenlclarkestephenlclarke
commented
Jul 18, 2026

Copy link


Copy Markdown

Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
apple/container#1927 documents a copy-out stall that can leave a container cp request waiting without a response. apple/containerization#799 addresses the guest-side lifecycle lock responsible for that stall. This PR makes the apple/container client's existing response timeout a reliable safeguard when a peer still does not reply.
XPCClient.send races a timeout task against an XPC reply task. The reply task waits in a checked continuation, but an XPC reply callback does not observe task cancellation. When the timeout wins, that continuation remained suspended and the task group continued to wait indefinitely.
This change uses a locked, one-shot continuation bridge: cancellation resumes it exactly once, and any later XPC reply is ignored. The scope is intentionally limited to cancellable request handling; it does not include the unrelated unknown-route behaviour proposed in #1862.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs (not needed: no public API or CLI behaviour changes)
Validation
  • swift test --disable-automatic-resolution -Xswiftc -warnings-as-errors --filter XPCClientTests — 5/5 passed. These exercise a real anonymous XPC endpoint: response timeout, direct caller cancellation, cancellation before continuation storage, client reuse, and late replies.
  • make test — passed: 570 tests in 71 suites (plus 94 XCTest cases).
  • make check — passed (Swift format and license-header checks).
  • git diff --check — passed.
  • make APP_ROOT=… LOG_ROOT=… SCRATCH_ROOT=… all integration — executed the VM integration suite. Warmup passed; the default-width run had three unrelated TCP-forwarding retries fail. Rerunning those three serially passed. A broader serial TestCLIRunCommand rerun was blocked before execution for its other cases because ghcr.io/linuxcontainers/alpine:3.20 was unavailable in the test environment.
Related
@stephenlclarke
fix(xpc): honor request timeouts
618d281
The XPC reply continuation did not observe task cancellation, so a configured client timeout could not complete until the server replied. Resume the continuation exactly once when cancellation wins and ignore late replies.
Refs: apple#1927
@stephenlclarke
stephenlclarke
marked this pull request as ready for review
July 22, 2026 21:13
@stephenlclarke
stephenlclarke
deleted the

fix/xpc-request-timeout

branch
August 3, 2026 07:12
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@stephenlclarke

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(xpc): honor request timeouts by stephenlclarke · Pull Request #1965 · apple/container · GitHub
Skip to content
fix(xpc): honor request timeouts - #1965
Closed
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Closed
fix(xpc): honor request timeouts#1965
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Conversation
@stephenlclarke
@stephenlclarkestephenlclarke
commented
Jul 18, 2026

Copy link


Copy Markdown

Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
apple/container#1927 documents a copy-out stall that can leave a container cp request waiting without a response. apple/containerization#799 addresses the guest-side lifecycle lock responsible for that stall. This PR makes the apple/container client's existing response timeout a reliable safeguard when a peer still does not reply.
XPCClient.send races a timeout task against an XPC reply task. The reply task waits in a checked continuation, but an XPC reply callback does not observe task cancellation. When the timeout wins, that continuation remained suspended and the task group continued to wait indefinitely.
This change uses a locked, one-shot continuation bridge: cancellation resumes it exactly once, and any later XPC reply is ignored. The scope is intentionally limited to cancellable request handling; it does not include the unrelated unknown-route behaviour proposed in #1862.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs (not needed: no public API or CLI behaviour changes)
Validation
  • swift test --disable-automatic-resolution -Xswiftc -warnings-as-errors --filter XPCClientTests — 5/5 passed. These exercise a real anonymous XPC endpoint: response timeout, direct caller cancellation, cancellation before continuation storage, client reuse, and late replies.
  • make test — passed: 570 tests in 71 suites (plus 94 XCTest cases).
  • make check — passed (Swift format and license-header checks).
  • git diff --check — passed.
  • make APP_ROOT=… LOG_ROOT=… SCRATCH_ROOT=… all integration — executed the VM integration suite. Warmup passed; the default-width run had three unrelated TCP-forwarding retries fail. Rerunning those three serially passed. A broader serial TestCLIRunCommand rerun was blocked before execution for its other cases because ghcr.io/linuxcontainers/alpine:3.20 was unavailable in the test environment.
Related
@stephenlclarke
fix(xpc): honor request timeouts
618d281
The XPC reply continuation did not observe task cancellation, so a configured client timeout could not complete until the server replied. Resume the continuation exactly once when cancellation wins and ignore late replies.
Refs: apple#1927
@stephenlclarke
stephenlclarke
marked this pull request as ready for review
July 22, 2026 21:13
@stephenlclarke
stephenlclarke
deleted the

fix/xpc-request-timeout

branch
August 3, 2026 07:12
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@stephenlclarke

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
fix(xpc): honor request timeouts by stephenlclarke · Pull Request #1965 · apple/container · GitHub
Skip to content
fix(xpc): honor request timeouts - #1965
Closed
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Closed
fix(xpc): honor request timeouts#1965
stephenlclarke wants to merge 1 commit into
apple:mainfrom 
stephenlclarke:fix/xpc-request-timeout
Conversation
@stephenlclarke
@stephenlclarkestephenlclarke
commented
Jul 18, 2026

Copy link


Copy Markdown

Type of Change
  •  Bug fix
  •  New feature
  •  Breaking change
  •  Documentation update
Motivation and Context
apple/container#1927 documents a copy-out stall that can leave a container cp request waiting without a response. apple/containerization#799 addresses the guest-side lifecycle lock responsible for that stall. This PR makes the apple/container client's existing response timeout a reliable safeguard when a peer still does not reply.
XPCClient.send races a timeout task against an XPC reply task. The reply task waits in a checked continuation, but an XPC reply callback does not observe task cancellation. When the timeout wins, that continuation remained suspended and the task group continued to wait indefinitely.
This change uses a locked, one-shot continuation bridge: cancellation resumes it exactly once, and any later XPC reply is ignored. The scope is intentionally limited to cancellable request handling; it does not include the unrelated unknown-route behaviour proposed in #1862.
Testing
  •  Tested locally
  •  Added/updated tests
  •  Added/updated docs (not needed: no public API or CLI behaviour changes)
Validation
  • swift test --disable-automatic-resolution -Xswiftc -warnings-as-errors --filter XPCClientTests — 5/5 passed. These exercise a real anonymous XPC endpoint: response timeout, direct caller cancellation, cancellation before continuation storage, client reuse, and late replies.
  • make test — passed: 570 tests in 71 suites (plus 94 XCTest cases).
  • make check — passed (Swift format and license-header checks).
  • git diff --check — passed.
  • make APP_ROOT=… LOG_ROOT=… SCRATCH_ROOT=… all integration — executed the VM integration suite. Warmup passed; the default-width run had three unrelated TCP-forwarding retries fail. Rerunning those three serially passed. A broader serial TestCLIRunCommand rerun was blocked before execution for its other cases because ghcr.io/linuxcontainers/alpine:3.20 was unavailable in the test environment.
Related
@stephenlclarke
fix(xpc): honor request timeouts
618d281
The XPC reply continuation did not observe task cancellation, so a configured client timeout could not complete until the server replied. Resume the continuation exactly once when cancellation wins and ignore late replies.
Refs: apple#1927
@stephenlclarke
stephenlclarke
marked this pull request as ready for review
July 22, 2026 21:13
@stephenlclarke
stephenlclarke
deleted the

fix/xpc-request-timeout

branch
August 3, 2026 07:12
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

1 participant

@stephenlclarke