aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@suse.de>2009-01-21 23:14:12 +0000
committerAndreas Schwab <schwab@suse.de>2009-01-21 23:14:12 +0000
commitf00d47a36f231efd49b8088cd74c9b092f9dbc4a (patch)
treef87e95c4553798a8854a773a9562a50e10a5a262
parent965cb60a21674edb8e20b1a2a41297bcd4622361 (diff)
downloadglibc-f00d47a36f231efd49b8088cd74c9b092f9dbc4a.zip
glibc-f00d47a36f231efd49b8088cd74c9b092f9dbc4a.tar.gz
glibc-f00d47a36f231efd49b8088cd74c9b092f9dbc4a.tar.bz2
Remove conflict marker.
Properly handle partial reads. Ulrich Drepper <drepper@redhat.com> Reported by Peter Festner <peter.festner@ewetel.net>. Tomas Janousek <tjanouse@redhat.com> Ulrich Drepper <drepper@redhat.com>
-rw-r--r--ChangeLog11
1 files changed, 5 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f8a5cde..f98ef3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,7 +80,6 @@
* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyaddr2_r): Check and
adjust the buffer alignment.
->>>>>>> 1.11443
2009-01-07 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/Makefile (sysdep_headers) [subdir=socket]:
@@ -570,7 +569,7 @@
[BZ #6942]
* resolv/res_send.c (send_vc): Fix use of unaligned address.
- Properly handle partial reads.
+ Properly handle partial reads.
2008-10-01 Mark Shinwell <shinwell@codesourcery.com>
@@ -621,7 +620,7 @@
Patch by Michael Solberg <msolberg@redhat.com>.
2008-09-12 Flavio Leitner <fleitner@redhat.com>
- Ulrich Drepper <drepper@redhat.com>
+ Ulrich Drepper <drepper@redhat.com>
* malloc/malloc.c (public_vALLOc): Try other arenas in case
_int_valloc fails.
@@ -4574,7 +4573,7 @@
2007-08-16 Andreas Jaeger <aj@suse.de>
* locale/localeinfo.h: Make _nl_category_name_idxs extern.
- Reported by Peter Festner <peter.festner@ewetel.net>.
+ Reported by Peter Festner <peter.festner@ewetel.net>.
2007-08-17 Jakub Jelinek <jakub@redhat.com>
@@ -5664,8 +5663,8 @@
* sysdeps/generic/ldsodefs.h (_dl_addr_inside_object): New prototype.
2007-06-18 Jakub Jelinek <jakub@redhat.com>
- Tomas Janousek <tjanouse@redhat.com>
- Ulrich Drepper <drepper@redhat.com>
+ Tomas Janousek <tjanouse@redhat.com>
+ Ulrich Drepper <drepper@redhat.com>
[BZ #4647]
* resolv/res_send.c (send_dg): Remove socket_pf. Use ipv6_unavail