security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

* Makefile.am, http.c (start_server): Minor tweaks to get http-test

Browse Source 
compiling again.
This commit is contained in:
David Shaw 2009-03-13 17:27:35 +00:00
parent c092f026fe
commit 81723b397a
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/ChangeLog
View File

@ -1,3 +1,8 @@
2009-03-13 David Shaw <dshaw@jabberwocky.com>
* Makefile.am, http.c (start_server): Minor tweaks to get
http-test compiling again.
2008-09-05 David Shaw <dshaw@jabberwocky.com> 2008-09-05 David Shaw <dshaw@jabberwocky.com>
* Makefile.am: Use $(CC) instead of "cc" to compile, as the user * Makefile.am: Use $(CC) instead of "cc" to compile, as the user

11
util/Makefile.am
View File

@ -1,4 +1,5 @@
# Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation, Inc. # Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006, 2008
# 2009 Free Software Foundation, Inc.
# #
# This file is part of GnuPG. # This file is part of GnuPG.
# #
@ -64,17 +65,17 @@ libcompat_a_DEPENDENCIES = @LIBOBJS@
libcompat_a_LIBADD = @LIBOBJS@ libcompat_a_LIBADD = @LIBOBJS@
http-test: http.c http-test: http.c
$(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \
-DTEST -o http-test http.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ -DTEST -o http-test http.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
srv-test: srv.c srv-test: srv.c
$(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \
-DTEST -o srv-test srv.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ -DTEST -o srv-test srv.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
pka-test: pka.c pka-test: pka.c
$(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \
-DTEST -o pka-test pka.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ -DTEST -o pka-test pka.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@
cert-test: cert.c cert-test: cert.c
$(CC) -DHAVE_CONFIG_H -I. -I. -I.. $(INCLUDES) $(LDFLAGS) -g -Wall \ $(CC) -DHAVE_CONFIG_H $(CFLAGS) -I. $(INCLUDES) $(LDFLAGS) -g -Wall \
-DTEST -o cert-test cert.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@ -DTEST -o cert-test cert.c libutil.a @LIBINTL@ @DNSLIBS@ @CAPLIBS@

6
util/http.c
View File

@ -1,6 +1,6 @@
/* http.c - HTTP protocol handler /* http.c - HTTP protocol handler
* Copyright (C) 1999, 2001, 2002, 2003, 2004, * Copyright (C) 1999, 2001, 2002, 2003, 2004,
* 2005 Free Software Foundation, Inc. * 2005, 2009 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -713,7 +713,7 @@ parse_response( HTTP_HD hd )
#ifdef TEST #ifdef TEST
static int static int
start_server() start_server(void)
{ {
struct sockaddr_in mya; struct sockaddr_in mya;
struct sockaddr_in peer; struct sockaddr_in peer;
@ -1062,7 +1062,7 @@ main(int argc, char **argv)
} }
release_parsed_uri( uri ); uri = NULL; release_parsed_uri( uri ); uri = NULL;
rc = http_open_document( &hd, *argv, 0, NULL ); rc = http_open_document( &hd, *argv, NULL, 0, NULL );
if( rc ) { if( rc ) {
log_error("can't get `%s': %s\n", *argv, g10_errstr(rc)); log_error("can't get `%s': %s\n", *argv, g10_errstr(rc));
return 1; return 1;