diff --git a/www/http_load/Makefile b/www/http_load/Makefile index f02eda350aa..1ab60805bac 100644 --- a/www/http_load/Makefile +++ b/www/http_load/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2005/09/22 12:58:51 avsm Exp $ +# $OpenBSD: Makefile,v 1.15 2006/03/05 21:12:12 sturm Exp $ COMMENT= "multiprocessing HTTP performance testing client" DISTNAME= http_load-29jun2005 -PKGNAME= http_load-20050629 +PKGNAME= http_load-20050629p0 CATEGORIES= www benchmarks MASTER_SITES= ${HOMEPAGE} diff --git a/www/http_load/patches/patch-http_load_c b/www/http_load/patches/patch-http_load_c new file mode 100644 index 00000000000..584d41cb85d --- /dev/null +++ b/www/http_load/patches/patch-http_load_c @@ -0,0 +1,56 @@ +$OpenBSD: patch-http_load_c,v 1.3 2006/03/05 21:12:13 sturm Exp $ +--- http_load.c.orig Fri May 20 21:10:23 2005 ++++ http_load.c Mon Feb 27 18:26:05 2006 +@@ -655,11 +655,11 @@ lookup_address( int url_num ) + (void) memset( &hints, 0, sizeof(hints) ); + hints.ai_family = PF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; +- (void) snprintf( portstr, sizeof(portstr), "%d", (int) urls[url_num].port ); +- if ( (gaierr = getaddrinfo( urls[url_num].hostname, portstr, &hints, &ai )) != 0 ) ++ (void) snprintf( portstr, sizeof(portstr), "%d", (int) port ); ++ if ( (gaierr = getaddrinfo( hostname, portstr, &hints, &ai )) != 0 ) + { + (void) fprintf( +- stderr, "%s: getaddrinfo %s - %s\n", argv0, urls[url_num].hostname, ++ stderr, "%s: getaddrinfo %s - %s\n", argv0, hostname, + gai_strerror( gaierr ) ); + exit( 1 ); + } +@@ -689,7 +689,7 @@ lookup_address( int url_num ) + { + (void) fprintf( + stderr, "%s - sockaddr too small (%lu < %lu)\n", +- urls[url_num].hostname, ++ hostname, + (unsigned long) sizeof(urls[url_num].sa), + (unsigned long) aiv4->ai_addrlen ); + exit( 1 ); +@@ -708,7 +708,7 @@ lookup_address( int url_num ) + { + (void) fprintf( + stderr, "%s - sockaddr too small (%lu < %lu)\n", +- urls[url_num].hostname, ++ hostname, + (unsigned long) sizeof(urls[url_num].sa), + (unsigned long) aiv6->ai_addrlen ); + exit( 1 ); +@@ -723,16 +723,15 @@ lookup_address( int url_num ) + } + + (void) fprintf( +- stderr, "%s: no valid address found for host %s\n", argv0, +- urls[url_num].hostname ); ++ stderr, "%s: no valid address found for host %s\n", argv0, hostname ); + exit( 1 ); + + #else /* USE_IPV6 */ + +- he = gethostbyname( urls[url_num].hostname ); ++ he = gethostbyname( hostname ); + if ( he == (struct hostent*) 0 ) + { +- (void) fprintf( stderr, "%s: unknown host - %s\n", argv0, urls[url_num].hostname ); ++ (void) fprintf( stderr, "%s: unknown host - %s\n", argv0, hostname ); + exit( 1 ); + } + urls[url_num].sock_family = urls[url_num].sa.sin_family = he->h_addrtype;