minor compilation and regresson fixes; from Frank Denis

svn:r952

diff --git a/test/Makefile.am b/test/Makefile.am
index ffa291d7415728160edb1aa236dbbfc408a3862f..7b24502f9cf7ace73a68e60d7156523e117550ac 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -28,6 +28,7 @@ endif
 regress_LDADD = ../libevent.la $(PTHREAD_LIBS) $(ZLIB_LIBS)
 regress_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat \
        -I$(top_srcdir)/include  $(PTHREAD_CFLAGS) $(ZLIB_CFLAGS)
+regress_LDFLAGS = $(PTHREAD_CFLAGS)
 bench_SOURCES = bench.c
 bench_LDADD = ../libevent.la
 bench_cascade_SOURCES = bench_cascade.c

diff --git a/test/regress_http.c b/test/regress_http.c
index 630cf762025d0f959c115aab291eae84af076f68..afb0e1d94bcb4a8fda8fe2dfd0e8148888c774a1 100644 (file)
--- a/test/regress_http.c
+++ b/test/regress_http.c
@@ -2014,6 +2014,11 @@ http_stream_in_cancel_test(void)
 static void
 http_connection_retry_done(struct evhttp_request *req, void *arg)
 {
+       if (req == NULL) {
+               fprintf(stderr, "FAILED (connection aborted)\n");
+               exit(1);
+       }
+       
        if (req->response_code == HTTP_OK) {
                fprintf(stderr, "FAILED\n");
                exit(1);