|
Line
Link Here
|
| 0 |
-- polipo-1.0.4/dns.c.orig 2008-01-08 16:56:45.000000000 +0400 |
0 |
++ polipo-1.0.4/dns.c 2010-03-29 18:28:43.225601510 +0500 |
|
Lines 1181-1187
Link Here
|
| 1181 |
} else |
1181 |
} else |
| 1182 |
releaseAtom(value); |
1182 |
releaseAtom(value); |
| 1183 |
} else if(af == 0) { |
1183 |
} else if(af == 0) { |
| 1184 |
if(query->inet4 || query->inet6) { |
1184 |
if(query->inet4 && query->inet4->length || |
|
|
1185 |
query->inet6 && query->inet6->length) { |
| 1185 |
do_log(L_WARN, "Host %s has both %s and CNAME -- " |
1186 |
do_log(L_WARN, "Host %s has both %s and CNAME -- " |
| 1186 |
"ignoring CNAME.\n", query->name->string, |
1187 |
"ignoring CNAME.\n", query->name->string, |
| 1187 |
query->inet4 ? "A" : "AAAA"); |
1188 |
query->inet4 ? "A" : "AAAA"); |
|
Lines 1207-1213
Link Here
|
| 1207 |
if(object->flags & OBJECT_INITIAL) { |
1208 |
if(object->flags & OBJECT_INITIAL) { |
| 1208 |
assert(!object->headers); |
1209 |
assert(!object->headers); |
| 1209 |
if(cname) { |
1210 |
if(cname) { |
| 1210 |
assert(query->inet4 == NULL && query->inet6 == NULL); |
1211 |
assert(!(query->inet4 && query->inet4->length)); |
|
|
1212 |
assert(!(query->inet6 && query->inet6->length)); |
| 1211 |
object->headers = cname; |
1213 |
object->headers = cname; |
| 1212 |
object->expires = current_time.tv_sec + ttl; |
1214 |
object->expires = current_time.tv_sec + ttl; |
| 1213 |
} else if((!query->inet4 || query->inet4->length == 0) && |
1215 |
} else if((!query->inet4 || query->inet4->length == 0) && |
