diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-05 18:11:40 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-05 18:11:40 +0000 |
| commit | 483c4fc6d4bf85fcf5e3e74631576eecb0b2efdb (patch) | |
| tree | 234f91c2b32be40cea636bdacf6881bfd0820975 | |
| parent | 02d3ed7587f73d61710b8e0eb0472d3ff397d7d0 (diff) | |
| download | ATCD-483c4fc6d4bf85fcf5e3e74631576eecb0b2efdb.tar.gz | |
ChangeLogTag:Tue Dec 5 10:07:14 2000 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 0b4f176d09d..690d1a257fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,11 +85,7 @@ Mon Dec 04 16:32:11 2000 Ossama Othman <ossama@uci.edu> cases. They are apparently not necessary when performing a SSL write. -<<<<<<< ChangeLog - * ace/SSL/SSL_SOCK_Acceptor.cpp: -======= * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): ->>>>>>> 4.1304 Check that the X.509 verification didn't fail. If the verification failed then do not continue. @@ -212,7 +208,6 @@ Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu> * ACE version 5.1.11 released. ->>>>>>> 4.1299 Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu> * apps/drwho/server.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 0b4f176d09d..690d1a257fc 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -85,11 +85,7 @@ Mon Dec 04 16:32:11 2000 Ossama Othman <ossama@uci.edu> cases. They are apparently not necessary when performing a SSL write. -<<<<<<< ChangeLog - * ace/SSL/SSL_SOCK_Acceptor.cpp: -======= * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): ->>>>>>> 4.1304 Check that the X.509 verification didn't fail. If the verification failed then do not continue. @@ -212,7 +208,6 @@ Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu> * ACE version 5.1.11 released. ->>>>>>> 4.1299 Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu> * apps/drwho/server.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 0b4f176d09d..690d1a257fc 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -85,11 +85,7 @@ Mon Dec 04 16:32:11 2000 Ossama Othman <ossama@uci.edu> cases. They are apparently not necessary when performing a SSL write. -<<<<<<< ChangeLog - * ace/SSL/SSL_SOCK_Acceptor.cpp: -======= * ace/SSL/SSL_SOCK_Acceptor.cpp (ssl_accept): ->>>>>>> 4.1304 Check that the X.509 verification didn't fail. If the verification failed then do not continue. @@ -212,7 +208,6 @@ Thu Nov 30 22:49:10 2000 pradeep@cs.wustl.edu <pradeep@cs.wustl.edu> * ACE version 5.1.11 released. ->>>>>>> 4.1299 Wed Nov 29 23:55:37 2000 Pradeep Gore <pradeep@cs.wustl.edu> * apps/drwho/server.cpp: |