Skip to content

Commit 0fef250

Browse files
chrisdickinsonchrisdickinson
committed
dns: propagate domain for c-ares methods
Fixes: nodejs/node-v0.x-archive#5471 PR-URL: nodejs/node-v0.x-archive#8732 Reviewed-by: Trevor Norris <trev.norris@gmail.com>
1 parent 743a009 commit 0fef250

2 files changed

Lines changed: 48 additions & 0 deletions

File tree

‎src/cares_wrap.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,8 @@ class QueryWrap : public AsyncWrap {
230230
public:
231231
QueryWrap(Environment* env, Local<Object> req_wrap_obj)
232232
: AsyncWrap(env, req_wrap_obj, AsyncWrap::PROVIDER_CARES) {
233+
if (env->in_domain())
234+
req_wrap_obj->Set(env->domain_string(), env->domain_array()->Get(0));
233235
}
234236

235237
virtual ~QueryWrap() {

‎test/simple/test-dns-cares-domains.js‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
var dns = require('dns');
25+
var domain = require('domain');
26+
27+
var methods = [
28+
'resolve4',
29+
'resolve6',
30+
'resolveCname',
31+
'resolveMx',
32+
'resolveNs',
33+
'resolveTxt',
34+
'resolveSrv',
35+
'resolveNaptr',
36+
'resolveSoa'
37+
]
38+
39+
methods.forEach(function(method) {
40+
var d = domain.create();
41+
d.run(function() {
42+
dns[method]('google.com', function() {
43+
assert.strictEqual(process.domain, d, method + ' retains domain')
44+
});
45+
});
46+
});

0 commit comments

Comments
 (0)