Log of /httpd/flood/trunk/flood_net_ssl.c

---

Revision 698796 - (view) (download) (annotate) - [select for diffs]
Modified Thu Sep 25 01:47:23 2008 UTC (15 years, 10 months ago) by jerenkrantz
File length: 9067 byte(s)
Diff to previous 696055 (colored)

Fix HTTP keepalives over SSL.

* flood_net_ssl.c
  (ssl_check_socket): Implement.
* flood_net_ssl.h
  (ssl_check_socket): Declare.
* flood_socket_keepalive.c
  (ksock_check_socket, ksock_close_socket): Declare helper macros.
  (keepalive_begin_conn): Use helper function to call appropriate checker.
  (keepalive_end_conn): Use helper to close socket.

---

Revision 696055 - (view) (download) (annotate) - [select for diffs]
Modified Tue Sep 16 21:01:30 2008 UTC (15 years, 10 months ago) by jerenkrantz
File length: 8860 byte(s)
Diff to previous 653656 (colored)

Fix up various compiler warnings.

* flood_net_ssl.c, flood_net_ssl.h
  (ssl_read_socket): Switch from int to apr_size_t.
* flood_socket_keepalive.c
  (keepalive_read_chunk, keepalive_load_resp, keepalive_recv_resp): Switch
  from int to apr_size_t.
* flood_round_robin.c
  (round_robin_postprocess): Switch from int to apr_size_t.
* flood_net.c, flood_net.h
  (read_socket): Switch from int to apr_size_t.

---

Revision 653656 - (view) (download) (annotate) - [select for diffs]
Modified Tue May 6 00:42:11 2008 UTC (16 years, 3 months ago) by fielding
File length: 8846 byte(s)
Diff to previous 647749 (colored)

promote flood to released products

---

Revision 647749 - (view) (download) (annotate) - [select for diffs]
Modified Mon Apr 14 12:16:14 2008 UTC (16 years, 4 months ago) by wrowe
Original Path: httpd/test/flood/trunk/flood_net_ssl.c
File length: 8846 byte(s)
Diff to previous 490946 (colored)

flood is independent of framework, mod_specweb etc

---

Revision 490946 - (view) (download) (annotate) - [select for diffs]
Modified Fri Dec 29 07:49:58 2006 UTC (17 years, 7 months ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 8846 byte(s)
Diff to previous 106525 (colored)

Update flood to the new license header.

* flood/NOTICE: Update the copyright year to the date of first publication.

* flood/flood_farmer.c, flood/flood_report_relative_times.h,
  flood/flood_simple_reports.h, flood/flood_test.c, flood/flood.c,
  flood/flood_farmer.h, flood/flood_socket_generic.c, flood/flood_farm.c,
  flood/flood_socket_generic.h, flood/flood_farm.h, flood/flood_config.c,
  flood/flood_net_ssl.c, flood/flood_config.h, flood/flood_net_ssl.h,
  flood/flood_socket_keepalive.c, flood/flood_easy_reports.c,
  flood/flood_round_robin.c, flood/flood_socket_keepalive.h,
  flood/flood_easy_reports.h, flood/flood_round_robin.h, flood/flood_net.c,
  flood/flood_net.h, flood/flood_profile.c, flood/flood_profile.h,
  flood/flood_report_relative_times.c, flood/flood_simple_reports.c:
  Update to new license header.

(Used committers/relicense/src/perl/update-AL20.pl)

---

Revision 106525 - (view) (download) (annotate) - [select for diffs]
Modified Thu Nov 25 00:36:41 2004 UTC (19 years, 8 months ago) by nd
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 8663 byte(s)
Diff to previous 102613 (colored)

property cleanup

---

Revision 102613 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 9 08:12:56 2004 UTC (20 years, 6 months ago) by jacekp
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 8663 byte(s)
Diff to previous 102612 (colored)

fixed typo.

---

Revision 102612 - (view) (download) (annotate) - [select for diffs]
Modified Sun Feb 8 23:34:41 2004 UTC (20 years, 6 months ago) by jacekp
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 8659 byte(s)
Diff to previous 102138 (colored)

migrating to ALv2

---

Revision 102138 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 1 13:38:37 2004 UTC (20 years, 7 months ago) by nd
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10685 byte(s)
Diff to previous 101177 (colored)

update license and copyright to 2004

---

Revision 101177 - (view) (download) (annotate) - [select for diffs]
Modified Sat Sep 6 04:27:37 2003 UTC (20 years, 11 months ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10685 byte(s)
Diff to previous 98570 (colored)

Fix two minor bugs:

* Change open_socket prototype to return errors.
* Fix HEAD responses with Content-Length specified being handled incorrectly.

---

Revision 98570 - (view) (download) (annotate) - [select for diffs]
Modified Mon Feb 3 17:11:02 2003 UTC (21 years, 6 months ago) by nd
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10573 byte(s)
Diff to previous 96014 (colored)

bah! what a boring job - update license to 2003.

---

Revision 96014 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 11 18:47:45 2002 UTC (22 years, 1 month ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10568 byte(s)
Diff to previous 95431 (colored)

Switch to using the new apr_poll() API.

---

Revision 95431 - (view) (download) (annotate) - [select for diffs]
Modified Fri May 31 07:59:27 2002 UTC (22 years, 2 months ago) by wrowe
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10511 byte(s)
Diff to previous 94572 (colored)

  Fix massive header bogosity

---

Revision 94572 - (view) (download) (annotate) - [select for diffs]
Modified Tue Apr 9 08:01:23 2002 UTC (22 years, 4 months ago) by aaron
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10481 byte(s)
Diff to previous 92718 (colored)

Stop using the old apr_lock.h API and start just using the
apr_thread_mutex.h interface for everything. Also get rid of the
USE_RW_LOCK_FOR_SSL thing, since I don't see how it makes sense with
the new lock types (maybe it's just too late and my eyes are squinting
too much :). We didn't have an autoconf feature test for it or anything.

---

Revision 92718 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jan 3 15:45:57 2002 UTC (22 years, 7 months ago) by aaron
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 11280 byte(s)
Diff to previous 92355 (colored)

This API has changed in APR, this brings us up to date. This whole thing
will be ripped out by me and replaced with the new lock API, but this
will keep us compiling.

---

Revision 92355 - (view) (download) (annotate) - [select for diffs]
Modified Thu Dec 6 18:03:32 2001 UTC (22 years, 8 months ago) by aaron
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10937 byte(s)
Diff to previous 92316 (colored)

Whoops! Fix backwards CPP logic that would prevent rwlocks from
being initialized.

---

Revision 92316 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 4 10:08:30 2001 UTC (22 years, 8 months ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10937 byte(s)
Diff to previous 92314 (colored)

Seed OpenSSL from memory instead of from a rnd file when we don't have
random device support.
(Also deprecate --with-randfile as we never need it anymore.)
Submitted by:	Doug MacEachern
Reviewed by:	Justin Erenkrantz, Aaron Bannert

---

Revision 92314 - (view) (download) (annotate) - [select for diffs]
Modified Tue Dec 4 09:38:53 2001 UTC (22 years, 8 months ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10201 byte(s)
Diff to previous 92003 (colored)

- Look for certs dir in logical places if not overriden.
- Have knowledge of platforms with /dev/random and /dev/urandom where
  OpenSSL will get the entropy on its own anyway.  If --with-randfile is
  not specified, we'll see if it even matters.
- Don't call RAND_load_file if we are relying on /dev/random.

---

Revision 92003 - (view) (download) (annotate) - [select for diffs]
Modified Sat Nov 17 01:26:48 2001 UTC (22 years, 9 months ago) by aaron
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10171 byte(s)
Diff to previous 92000 (colored)

These are helpful.

---

Revision 92000 - (view) (download) (annotate) - [select for diffs]
Modified Sat Nov 17 01:21:32 2001 UTC (22 years, 9 months ago) by aaron
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 10147 byte(s)
Diff to previous 91998 (colored)

Decided to do this the right way. If we don't have FLOOD_HAS_OPENSSL
then define the functions so that they return APR_ENOTIMPL.

---

Revision 91998 - (view) (download) (annotate) - [select for diffs]
Modified Sat Nov 17 00:23:28 2001 UTC (22 years, 9 months ago) by aaron
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 9745 byte(s)
Diff to previous 91410 (colored)

Conditionally compile these routines, only if FLOOD_HAS_OPENSSL
is defined.

Out damn compiler warning! Some of these routines were neither prototyped
nor declared static. I opted for the latter.

Added comments to remind us to:
 - convert to the new APR lock API
 - stop using the thread id as an identifier -- it's not crossplatform

---

Revision 91410 - (view) (download) (annotate) - [select for diffs]
Modified Wed Oct 10 21:42:07 2001 UTC (22 years, 10 months ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 9517 byte(s)
Diff to previous 90615 (colored)

It'd help when testing mod_ssl if the test program could handle SSL
buffering correctly.

Call SSL_pending before doing the poll to see if we could satisfy
the current request without reading from the raw socket.

What a nightmare.  mod_ssl has probably been working for a week.  *Gag*

---

Revision 90615 - (view) (download) (annotate) - [select for diffs]
Modified Fri Aug 24 04:26:39 2001 UTC (22 years, 11 months ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 9287 byte(s)
Diff to previous 90002 (colored)

Per Sander, Linux 2.4 returns EAGAIN when we run out of ports.

---

Revision 90002 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 7 19:37:09 2001 UTC (23 years ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 9122 byte(s)
Diff to previous 90000 (colored)

I partially retract my comment about the OpenSSL code, but I'll say that
the docs are misleading.  It seems that you must *always* use the static
locking mechanisms and then, optionally, the dynamic locking mechanisms.
(Based on the man page, this doesn't seem to be the case...)

I'm not sure which locking implementation fits OpenSSL better.  I saw
mixed results with APR_MUTEX vs. APR_READWRITE.  So, both are implemented
and can be toggled with an #ifdef.

Doesn't *seem* to crash so far.  That's good.  Grr.

---

Revision 90000 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 7 19:00:23 2001 UTC (23 years ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 7685 byte(s)
Diff to previous 89973 (colored)

Get OpenSSL code stable.  There are still some errors in the OpenSSL code,
but 95% of the time our threads complete - this is better than it was
(40-60% of our threads would get an error from OpenSSL).

Achieve this by the following actions:
- Remove the cafile logic in our OpenSSL calls as this is buggy code.  Use
  cadir logic instead.  Now defaults to /tmp/certdir.
- Don't use BIO in OpenSSL as this OpenSSL code is buggy.

---

Revision 89973 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 7 00:44:04 2001 UTC (23 years ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 7670 byte(s)
Diff to previous 89969 (colored)

Return APR_EOF if OpenSSL tells us that we got ZERO_RETURN

---

Revision 89969 - (view) (download) (annotate) - [select for diffs]
Modified Tue Aug 7 00:22:30 2001 UTC (23 years ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 7662 byte(s)
Diff to previous 89966 (colored)

Check the socketsread value.  If it is not 1, we timed out.

---

Revision 89966 - (view) (download) (annotate) - [select for diffs]
Modified Mon Aug 6 23:16:43 2001 UTC (23 years ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 7607 byte(s)
Diff to previous 89852 (colored)

Add OpenSSL locking routines (doesn't seem to be used, but they say you
should have it - okay...)

Update configure to have randfile (/tmp/.rnd) and cafile (/tmp/certs.pem)
to pass to OpenSSL.  These files must exist (and be valid) or OpenSSL is
going to throw a hissy fit.  Also, use OpenSSL 0.9.6b by default.

---

Revision 89852 - (view) (download) (annotate) - [select for diffs]
Modified Wed Aug 1 03:28:01 2001 UTC (23 years ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 6616 byte(s)
Diff to previous 89633 (colored)

Have the SSL socket code use the flood_socket_t.  This removes the need
for having a separate poll structure (use the one we create in the std.
socket code).

This requires that the flood_socket_t be a bit more public.  Which, IMHO,
isn't a big deal.

---

Revision 89633 - (view) (download) (annotate) - [select for diffs]
Modified Thu Jul 19 22:54:30 2001 UTC (23 years ago) by fielding
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 6798 byte(s)
Diff to previous 89579 (colored)

Add the ASF License to files that were missing it to verify that this
is being contributed to the ASF.

---

Revision 89579 - (view) (download) (annotate) - [select for diffs]
Added Wed Jul 18 03:42:18 2001 UTC (23 years, 1 month ago) by jerenkrantz
Original Path: httpd/test/trunk/flood/flood_net_ssl.c
File length: 4089 byte(s)

Initial revision