Nick Mathewson
e40bafe796
Merge remote-tracking branch 'origin/patches-2.0'
...
Conflicts:
Makefile.am
WIN32-Code/event2/event-config.h
configure.in
test/regress_ssl.c
2011-06-04 21:40:55 -04:00
Nick Mathewson
bdfb8330df
Fix regress_ssl.c build on openbsd
2011-06-03 17:06:17 -04:00
Nick Mathewson
5926d601bb
Merge branch '21_evport_improved'
2011-05-30 12:10:26 -04:00
Nick Mathewson
257651a48c
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-27 23:33:40 -04:00
Nick Mathewson
f47c15e7ba
Make the new http_connect_fail_test use a multicast addr, not broadcast
...
Turns out that FreeBSD does _not_ give a ENETUNREACH error when
told to make a TCP socket to 255.255.255.255, but it is quite happy
to do so for 239.10.20.30. So that's what we'll do.
Found by Robert Ransom and Dave Hart.
2011-05-27 23:30:06 -04:00
Nick Mathewson
e903db3362
Reenable main/many_events_slow_add for evport in 2.1
...
The various evport fixes should let it actually work again
2011-05-27 15:31:40 -04:00
Nick Mathewson
356720a23b
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-27 15:09:54 -04:00
Nick Mathewson
c11c6fcd82
Disable main/many_events_slow_add with evport backend
...
In 2.0 and earlier, evport only reports up to 8 events at a time, which
confuses this test badly.
2011-05-27 14:58:21 -04:00
Nick Mathewson
95f70166df
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-25 21:20:31 -04:00
Sebastian Hahn
d1b2d11bb5
Always use evutil_snprintf, even if OS provides it
...
In test/tinytest_local.h we can't redefine snprintf if the OS has it
defined already.
2011-05-26 02:05:54 +02:00
Peter Rosin
d41f3ea24e
Do not define WIN32 in Makefile.nmake
2011-05-25 20:04:53 -04:00
Nick Mathewson
9f560bfa11
Use "_WIN32", not WIN32: it's standard and we don't need to fake it
...
This patch was automatically generated with perl.
Based on a patch by Peter Rosin.
2011-05-25 20:03:15 -04:00
Nick Mathewson
0e95950e60
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-25 19:46:14 -04:00
Peter Rosin
0de87fe69c
Use evutil_gettimeofday instead of relying on the system gettimeofday.
2011-05-25 19:44:06 -04:00
Peter Rosin
3d768dc967
Fix winsock2.h #include issues with MSVC
...
Define WIN32_LEAN_AND_MEAN, so that windows.h does not bring in
winsock.h which in turn makes it impossible to #include <winsock2.h>
(at least with MSVC)
2011-05-25 19:44:06 -04:00
Peter Rosin
8fa030c032
Make sure TINYTEST_LOCAL is defined when building tinytest.c
2011-05-25 19:44:06 -04:00
Peter Rosin
fe93022a66
unistd.h and sys/time.h might not exist.
2011-05-25 19:44:06 -04:00
Nick Mathewson
9155b09534
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-25 16:52:50 -04:00
Nick Mathewson
06a714ffe4
Fix new warnings from GCC 4.6
2011-05-25 16:52:03 -04:00
Nick Mathewson
3ec46c0c34
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-23 01:44:05 -04:00
Kevin Ko
57ddda7845
Test case for 0848814ac49616
...
"I'm not sure if you'll like my use of the limited broadcast address
for simulating an ENETUNREACH error with a TCP connection, but it's
the best that I could think of. Basically, we want to trigger a
non-EINPROGRESS error in evutil_socket_connect() immediately at the
connect() in order to bring about the assertion in the
evhttp_connection_fail() error handling code."
2011-05-23 01:40:05 -04:00
Nick Mathewson
6b23518d85
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-06 11:06:11 -04:00
Sebastian Hahn
5786b91e2e
Fix a compile warning with zlib 1.2.4 and 1.2.5
...
I took this fix from Tor (commit 1a52e39c22d5, author Nick Mathewson,
Copyright (c) 2007-2011, The Tor Project, Inc.) and adapted it slightly
for libevent.
2011-05-06 10:58:06 -04:00
Nick Mathewson
7889c43ef8
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-04 16:23:02 -04:00
Peter Rosin
7b819f2d97
Libtool brings in the dependencies of libevent_openssl.la automatically
2011-05-04 16:18:51 -04:00
Peter Rosin
274dd0369a
libssl depends on libcrypto, not the other way around.
2011-05-04 16:18:46 -04:00
Nick Mathewson
9610797471
Merge remote-tracking branch 'origin/patches-2.0'
2011-05-03 14:29:44 -04:00
Nick Mathewson
d11e9e0f71
Oops; that new unit test breaks for epoll. Fix it.
2011-05-03 14:22:48 -04:00
Nick Mathewson
28317a087e
Fix a warn-and-fail bug in kqueue by providing kevent() room to report errors
...
Apparently, kevent fails gracefully if there is not enough space in its
output events array to report every _event_... but it just dies and returns
-1 if there is not enough space to report every _error_.
There are a couple of possible fixes here. One would to handle -1
returns from kevent better by re-growing the array and retrying... but
that seems a little error prone. Instead, I'm just going to say that
the events array must be large enough to handle all the errors.
This patch also adds a unit test designed to make sure that our
many-events-out code works even if not all the events are added at
once.
2011-05-03 13:54:57 -04:00
Nick Mathewson
cea45590e2
Merge remote-tracking branch 'origin/patches-2.0'
2011-04-24 22:56:16 -04:00
Nick Mathewson
ea0d019b71
Use AM_CONDITIONAL, not AC_SUBST, to tell automake to build regress
...
For some reason, this makes mingw much happier about building
regress.exe by default. No, I'm afraid I don't know why.
2011-04-23 02:35:17 -04:00
Nick Mathewson
18f24ef4d5
Merge remote-tracking branch 'origin/patches-2.0'
2011-04-23 02:31:59 -04:00
Nick Mathewson
dd68cce439
Add missing header for regress_http compilation on win32
2011-04-23 01:47:43 -04:00
Nick Mathewson
614a1712b7
Merge remote-tracking branch 'origin/patches-2.0'
...
Conflicts:
evthread.c
2011-04-22 23:46:25 -04:00
Sebastian Hahn
646f9feb26
Zero a struct sockaddr_in before using it
...
Found by Dave Heart
2011-04-23 02:22:08 +02:00
Sebastian Hahn
93a1abb374
Check return value of evbuffer_add_cb in tests
...
Caught by clang's static analyzer
2011-04-23 02:04:58 +02:00
Sebastian Hahn
48c44a6dda
Refactor test_getaddrinfo_async_cancel_stress()
...
Turns out it didn't need an event base set up.
Spotted by clang's static anaylzer
2011-04-23 02:04:58 +02:00
Sebastian Hahn
b693c324ca
Actually send NULL request in http_bad_request_test
...
Issue caught by clang's static analyzer
2011-04-23 02:04:58 +02:00
Sebastian Hahn
3819b62cea
Add a forgotten return value check in the unit tests
...
Spotted by clang's static analyzer
2011-04-23 02:04:58 +02:00
Nick Mathewson
975eacad36
Merge remote branch 'origin/patches-2.0'
2011-02-23 11:25:09 -05:00
Sebastian Hahn
3f79a3a01a
Continue AM_CFLAGS to AM_CPPFLAGS correction
...
9c469db300e1b270a93c6b04c1709ac0f7751136 had started with the conversion
but left out another instance of incorrectly used AM_CFLAGS.
Dave Hart provided the suggestion for this fix.
2011-02-23 12:17:08 +01:00
Nick Mathewson
e2e3c32239
Merge remote branch 'origin/patches-2.0'
2011-02-22 18:55:05 -05:00
Nick Mathewson
5dc200b7c8
Merge branch '20_uri_nonconformant' into patches-2.0
2011-02-22 18:53:55 -05:00
Nick Mathewson
a11c30b5fe
Merge remote branch 'origin/patches-2.0'
...
This branch is the big one that merges all the ntp folks' changes
Conflicts:
configure.in
2011-02-22 17:41:27 -05:00
Nick Mathewson
15b2408c9b
Use $(), not @@, for LIBEVENT_GC_SECTIONS
2011-02-22 16:13:49 -05:00
Nick Mathewson
039b9bd0e3
Use %s with printf in test.sh
2011-02-22 00:31:56 -05:00
Dave Hart
9c469db300
Correct an AM_CFLAGS to an AM_CPPFLAGS in test/Makefile.am
2011-02-22 00:29:12 -05:00
Dave Hart
49e9bb7fb0
Add configure options to disable installation, regression tests
...
The main reason for disabling installation is if you're building
libevent as a subpackage for embedding: you want to have your main
package's "make all" build libevent, but you don't want your main
package's "make install" to install libevent.
2011-02-22 00:28:37 -05:00
Dave Hart
0965c56356
Use the gcc -ffunction-segments feature to allow gc when linking with static libevent
2011-02-22 00:25:58 -05:00
Harlan Stenn
05a2c22fee
Make test-eof fail with a timeout if we never get an eof.
...
Previously, it would just wait forever.
2011-02-22 00:25:12 -05:00