Produced by Araxis Merge on Mon Mar 6 17:40:20 2006 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\Merge Test Files\4.0.6\catalina\src\share\org\apache\catalina\connector\http | HttpConnector.java | Tue Oct 8 15:15:34 2002 UTC |
| 2 | C:\Merge Test Files\4.1.18\catalina\src\share\org\apache\catalina\connector\http | HttpConnector.java | Thu Dec 19 13:49:44 2002 UTC |
| 3 | C:\Merge Test Files\4.1.24\catalina\src\share\org\apache\catalina\connector\http | HttpConnector.java | Wed Mar 19 09:18:40 2003 UTC |
| Note: Merge considers the second file to be the common ancestor of the others. | |||
| Description | Between Files 1 and 2 |
Between Files 2 and 3 |
Relative to Common Ancestor |
|||
|---|---|---|---|---|---|---|
| Text Blocks | Lines | Text Blocks | Lines | Text Blocks | Lines | |
| Unchanged | 18 | 1194 | 1 | 1286 | ||
| Changed | 8 | 72 | 0 | 0 | 8 | 72 |
| Inserted | 9 | 34 | 0 | 0 | 0 | 0 |
| Removed | 0 | 0 | 0 | 0 | 9 | 34 |
| Note: An automatic merge would leave 0 conflict(s). | ||||||
| Whitespace | All differences in whitespace within lines are ignored |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | /* | 1 | /* | 1 | /* | |||||
| 2 |
*
$Header:
/home/cvs/
jakarta-to
mcat-4.0/c
atalina/sr
c/share/or
g/apache/c
atalina/co
nnector/ht
tp/HttpCon
nector.jav
a,v
1.
2
4
.2.2
2002/0
1/
3
|
2 |
*
$Header:
/home/cvs/
jakarta-to
mcat-4.0/c
atalina/sr
c/share/or
g/apache/c
atalina/co
nnector/ht
tp/HttpCon
nector.jav
a,v
1.
3
4
|
2 | * $Header : /home/cv s/jakarta- tomcat-4.0 /catalina/ src/share/ org/apache /catalina/ connector/ http/HttpC onnector.j ava,v 1.34 2002/03/1 8 07:15:39 remm Exp $ | |||||
| 3 | * $Revision: 1. 2 4 .2.2 $ | 3 |
*
$Revision:
1.
3
4
|
3 | * $Revisi on: 1.34 $ | |||||
| 4 |
*
$Date:
2002/0
1/
3
|
4 |
*
$Date:
2002/0
|
4 | * $Date: 2002/03/18 07:15:39 $ | |||||
| 5 | * | 5 | * | 5 | * | |||||
| 6 | * ======= ========== ========== ========== ========== ========== ========== = | 6 | * ======= ========== ========== ========== ========== ========== ========== = | 6 | * ======= ========== ========== ========== ========== ========== ========== = | |||||
| 7 | * | 7 | * | 7 | * | |||||
| 8 | * The Apa che Softwa re License , Version 1.1 | 8 | * The Apa che Softwa re License , Version 1.1 | 8 | * The Apa che Softwa re License , Version 1.1 | |||||
| 9 | * | 9 | * | 9 | * | |||||
| 10 | * Copyrig ht (c) 199 9 The Apac he Softwar e Foundati on. All r ights | 10 | * Copyrig ht (c) 199 9 The Apac he Softwar e Foundati on. All r ights | 10 | * Copyrig ht (c) 199 9 The Apac he Softwar e Foundati on. All r ights | |||||
| 11 | * reserve d. | 11 | * reserve d. | 11 | * reserve d. | |||||
| 12 | * | 12 | * | 12 | * | |||||
| 13 | * Redistr ibution an d use in s ource and binary for ms, with o r without | 13 | * Redistr ibution an d use in s ource and binary for ms, with o r without | 13 | * Redistr ibution an d use in s ource and binary for ms, with o r without | |||||
| 14 | * modific ation, are permitted provided that the f ollowing c onditions | 14 | * modific ation, are permitted provided that the f ollowing c onditions | 14 | * modific ation, are permitted provided that the f ollowing c onditions | |||||
| 15 | * are met : | 15 | * are met : | 15 | * are met : | |||||
| 16 | * | 16 | * | 16 | * | |||||
| 17 | * 1. Redi stribution s of sourc e code mus t retain t he above c opyright | 17 | * 1. Redi stribution s of sourc e code mus t retain t he above c opyright | 17 | * 1. Redi stribution s of sourc e code mus t retain t he above c opyright | |||||
| 18 | * noti ce, this l ist of con ditions an d the foll owing disc laimer. | 18 | * noti ce, this l ist of con ditions an d the foll owing disc laimer. | 18 | * noti ce, this l ist of con ditions an d the foll owing disc laimer. | |||||
| 19 | * | 19 | * | 19 | * | |||||
| 20 | * 2. Redi stribution s in binar y form mus t reproduc e the abov e copyrigh t | 20 | * 2. Redi stribution s in binar y form mus t reproduc e the abov e copyrigh t | 20 | * 2. Redi stribution s in binar y form mus t reproduc e the abov e copyrigh t | |||||
| 21 | * noti ce, this l ist of con ditions an d the foll owing disc laimer in | 21 | * noti ce, this l ist of con ditions an d the foll owing disc laimer in | 21 | * noti ce, this l ist of con ditions an d the foll owing disc laimer in | |||||
| 22 | * the documentat ion and/or other mat erials pro vided with the | 22 | * the documentat ion and/or other mat erials pro vided with the | 22 | * the documentat ion and/or other mat erials pro vided with the | |||||
| 23 | * dist ribution. | 23 | * dist ribution. | 23 | * dist ribution. | |||||
| 24 | * | 24 | * | 24 | * | |||||
| 25 | * 3. The end-user d ocumentati on include d with the redistrib ution, if | 25 | * 3. The end-user d ocumentati on include d with the redistrib ution, if | 25 | * 3. The end-user d ocumentati on include d with the redistrib ution, if | |||||
| 26 | * any, must incl ude the fo llowing ac knowlegeme nt: | 26 | * any, must incl ude the fo llowing ac knowlegeme nt: | 26 | * any, must incl ude the fo llowing ac knowlegeme nt: | |||||
| 27 | * " This produ ct include s software developed by the | 27 | * " This produ ct include s software developed by the | 27 | * " This produ ct include s software developed by the | |||||
| 28 | * Apache Sof tware Foun dation (ht tp://www.a pache.org/ )." | 28 | * Apache Sof tware Foun dation (ht tp://www.a pache.org/ )." | 28 | * Apache Sof tware Foun dation (ht tp://www.a pache.org/ )." | |||||
| 29 | * Alte rnately, t his acknow legement m ay appear in the sof tware itse lf, | 29 | * Alte rnately, t his acknow legement m ay appear in the sof tware itse lf, | 29 | * Alte rnately, t his acknow legement m ay appear in the sof tware itse lf, | |||||
| 30 | * if a nd whereve r such thi rd-party a cknowlegem ents norma lly appear . | 30 | * if a nd whereve r such thi rd-party a cknowlegem ents norma lly appear . | 30 | * if a nd whereve r such thi rd-party a cknowlegem ents norma lly appear . | |||||
| 31 | * | 31 | * | 31 | * | |||||
| 32 | * 4. The names "The Jakarta P roject", " Tomcat", a nd "Apache Software | 32 | * 4. The names "The Jakarta P roject", " Tomcat", a nd "Apache Software | 32 | * 4. The names "The Jakarta P roject", " Tomcat", a nd "Apache Software | |||||
| 33 | * Foun dation" mu st not be used to en dorse or p romote pro ducts deri ved | 33 | * Foun dation" mu st not be used to en dorse or p romote pro ducts deri ved | 33 | * Foun dation" mu st not be used to en dorse or p romote pro ducts deri ved | |||||
| 34 | * from this soft ware witho ut prior w ritten per mission. F or written | 34 | * from this soft ware witho ut prior w ritten per mission. F or written | 34 | * from this soft ware witho ut prior w ritten per mission. F or written | |||||
| 35 | * perm ission, pl ease conta ct apache@ apache.org . | 35 | * perm ission, pl ease conta ct apache@ apache.org . | 35 | * perm ission, pl ease conta ct apache@ apache.org . | |||||
| 36 | * | 36 | * | 36 | * | |||||
| 37 | * 5. Prod ucts deriv ed from th is softwar e may not be called "Apache" | 37 | * 5. Prod ucts deriv ed from th is softwar e may not be called "Apache" | 37 | * 5. Prod ucts deriv ed from th is softwar e may not be called "Apache" | |||||
| 38 | * nor may "Apach e" appear in their n ames witho ut prior w ritten | 38 | * nor may "Apach e" appear in their n ames witho ut prior w ritten | 38 | * nor may "Apach e" appear in their n ames witho ut prior w ritten | |||||
| 39 | * perm ission of the Apache Group. | 39 | * perm ission of the Apache Group. | 39 | * perm ission of the Apache Group. | |||||
| 40 | * | 40 | * | 40 | * | |||||
| 41 | * THIS SO FTWARE IS PROVIDED ` `AS IS'' A ND ANY EXP RESSED OR IMPLIED | 41 | * THIS SO FTWARE IS PROVIDED ` `AS IS'' A ND ANY EXP RESSED OR IMPLIED | 41 | * THIS SO FTWARE IS PROVIDED ` `AS IS'' A ND ANY EXP RESSED OR IMPLIED | |||||
| 42 | * WARRANT IES, INCLU DING, BUT NOT LIMITE D TO, THE IMPLIED WA RRANTIES | 42 | * WARRANT IES, INCLU DING, BUT NOT LIMITE D TO, THE IMPLIED WA RRANTIES | 42 | * WARRANT IES, INCLU DING, BUT NOT LIMITE D TO, THE IMPLIED WA RRANTIES | |||||
| 43 | * OF MERC HANTABILIT Y AND FITN ESS FOR A PARTICULAR PURPOSE A RE | 43 | * OF MERC HANTABILIT Y AND FITN ESS FOR A PARTICULAR PURPOSE A RE | 43 | * OF MERC HANTABILIT Y AND FITN ESS FOR A PARTICULAR PURPOSE A RE | |||||
| 44 | * DISCLAI MED. IN N O EVENT SH ALL THE AP ACHE SOFTW ARE FOUNDA TION OR | 44 | * DISCLAI MED. IN N O EVENT SH ALL THE AP ACHE SOFTW ARE FOUNDA TION OR | 44 | * DISCLAI MED. IN N O EVENT SH ALL THE AP ACHE SOFTW ARE FOUNDA TION OR | |||||
| 45 | * ITS CON TRIBUTORS BE LIABLE FOR ANY DI RECT, INDI RECT, INCI DENTAL, | 45 | * ITS CON TRIBUTORS BE LIABLE FOR ANY DI RECT, INDI RECT, INCI DENTAL, | 45 | * ITS CON TRIBUTORS BE LIABLE FOR ANY DI RECT, INDI RECT, INCI DENTAL, | |||||
| 46 | * SPECIAL , EXEMPLAR Y, OR CONS EQUENTIAL DAMAGES (I NCLUDING, BUT NOT | 46 | * SPECIAL , EXEMPLAR Y, OR CONS EQUENTIAL DAMAGES (I NCLUDING, BUT NOT | 46 | * SPECIAL , EXEMPLAR Y, OR CONS EQUENTIAL DAMAGES (I NCLUDING, BUT NOT | |||||
| 47 | * LIMITED TO, PROCU REMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | 47 | * LIMITED TO, PROCU REMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | 47 | * LIMITED TO, PROCU REMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | |||||
| 48 | * USE, DA TA, OR PRO FITS; OR B USINESS IN TERRUPTION ) HOWEVER CAUSED AND | 48 | * USE, DA TA, OR PRO FITS; OR B USINESS IN TERRUPTION ) HOWEVER CAUSED AND | 48 | * USE, DA TA, OR PRO FITS; OR B USINESS IN TERRUPTION ) HOWEVER CAUSED AND | |||||
| 49 | * ON ANY THEORY OF LIABILITY, WHETHER I N CONTRACT , STRICT L IABILITY, | 49 | * ON ANY THEORY OF LIABILITY, WHETHER I N CONTRACT , STRICT L IABILITY, | 49 | * ON ANY THEORY OF LIABILITY, WHETHER I N CONTRACT , STRICT L IABILITY, | |||||
| 50 | * OR TORT (INCLUDIN G NEGLIGEN CE OR OTHE RWISE) ARI SING IN AN Y WAY OUT | 50 | * OR TORT (INCLUDIN G NEGLIGEN CE OR OTHE RWISE) ARI SING IN AN Y WAY OUT | 50 | * OR TORT (INCLUDIN G NEGLIGEN CE OR OTHE RWISE) ARI SING IN AN Y WAY OUT | |||||
| 51 | * OF THE USE OF THI S SOFTWARE , EVEN IF ADVISED OF THE POSSI BILITY OF | 51 | * OF THE USE OF THI S SOFTWARE , EVEN IF ADVISED OF THE POSSI BILITY OF | 51 | * OF THE USE OF THI S SOFTWARE , EVEN IF ADVISED OF THE POSSI BILITY OF | |||||
| 52 | * SUCH DA MAGE. | 52 | * SUCH DA MAGE. | 52 | * SUCH DA MAGE. | |||||
| 53 | * ======= ========== ========== ========== ========== ========== ========== = | 53 | * ======= ========== ========== ========== ========== ========== ========== = | 53 | * ======= ========== ========== ========== ========== ========== ========== = | |||||
| 54 | * | 54 | * | 54 | * | |||||
| 55 | * This so ftware con sists of v oluntary c ontributio ns made by many | 55 | * This so ftware con sists of v oluntary c ontributio ns made by many | 55 | * This so ftware con sists of v oluntary c ontributio ns made by many | |||||
| 56 | * individ uals on be half of th e Apache S oftware Fo undation. For more | 56 | * individ uals on be half of th e Apache S oftware Fo undation. For more | 56 | * individ uals on be half of th e Apache S oftware Fo undation. For more | |||||
| 57 | * informa tion on th e Apache S oftware Fo undation, please see | 57 | * informa tion on th e Apache S oftware Fo undation, please see | 57 | * informa tion on th e Apache S oftware Fo undation, please see | |||||
| 58 | * <http:/ /www.apach e.org/>. | 58 | * <http:/ /www.apach e.org/>. | 58 | * <http:/ /www.apach e.org/>. | |||||
| 59 | * | 59 | * | 59 | * | |||||
| 60 | * [Additi onal notic es, if req uired by p rior licen sing condi tions] | 60 | * [Additi onal notic es, if req uired by p rior licen sing condi tions] | 60 | * [Additi onal notic es, if req uired by p rior licen sing condi tions] | |||||
| 61 | * | 61 | * | 61 | * | |||||
| 62 | */ | 62 | */ | 62 | */ | |||||
| 63 | 63 | 63 | ||||||||
| 64 | 64 | 64 | ||||||||
| 65 | package or g.apache.c atalina.co nnector.ht tp; | 65 | package or g.apache.c atalina.co nnector.ht tp; | 65 | package or g.apache.c atalina.co nnector.ht tp; | |||||
| 66 | 66 | 66 | ||||||||
| 67 | 67 | 67 | ||||||||
| 68 | import jav a.io.IOExc eption; | 68 | import jav a.io.IOExc eption; | 68 | import jav a.io.IOExc eption; | |||||
| 69 | import jav a.net.Bind Exception; | 69 | import jav a.net.Bind Exception; | 69 | import jav a.net.Bind Exception; | |||||
| 70 | import jav a.net.Inet Address; | 70 | import jav a.net.Inet Address; | 70 | import jav a.net.Inet Address; | |||||
| 71 | import jav a.net.Serv erSocket; | 71 | import jav a.net.Serv erSocket; | 71 | import jav a.net.Serv erSocket; | |||||
| 72 | import jav a.net.Sock et; | 72 | import jav a.net.Sock et; | 72 | import jav a.net.Sock et; | |||||
| 73 | import jav a.net.Unkn ownHostExc eption; | 73 | import jav a.net.Unkn ownHostExc eption; | |||||||
| 73 | import jav a.security .AccessCon trolExcept ion; | 74 | import jav a.security .AccessCon trolExcept ion; | 74 | import jav a.security .AccessCon trolExcept ion; | |||||
| 74 | import jav a.util.Sta ck; | 75 | import jav a.util.Sta ck; | 75 | import jav a.util.Sta ck; | |||||
| 75 | import jav a.util.Vec tor; | 76 | import jav a.util.Vec tor; | 76 | import jav a.util.Vec tor; | |||||
| 76 | import jav a.util.Enu meration; | 77 | import jav a.util.Enu meration; | 77 | import jav a.util.Enu meration; | |||||
| 78 | import jav a.security .KeyStoreE xception; | 78 | import jav a.security .KeyStoreE xception; | |||||||
| 79 | import jav a.security .NoSuchAlg orithmExce ption; | 79 | import jav a.security .NoSuchAlg orithmExce ption; | |||||||
| 80 | import jav a.security .cert.Cert ificateExc eption; | 80 | import jav a.security .cert.Cert ificateExc eption; | |||||||
| 81 | import jav a.security .Unrecover ableKeyExc eption; | 81 | import jav a.security .Unrecover ableKeyExc eption; | |||||||
| 82 | import jav a.security .KeyManage mentExcept ion; | 82 | import jav a.security .KeyManage mentExcept ion; | |||||||
| 77 | import org .apache.ca talina.Con nector; | 83 | import org .apache.ca talina.Con nector; | 83 | import org .apache.ca talina.Con nector; | |||||
| 78 | import org .apache.ca talina.Con tainer; | 84 | import org .apache.ca talina.Con tainer; | 84 | import org .apache.ca talina.Con tainer; | |||||
| 79 | import org .apache.ca talina.Htt pRequest; | 85 | import org .apache.ca talina.Htt pRequest; | 85 | import org .apache.ca talina.Htt pRequest; | |||||
| 80 | import org .apache.ca talina.Htt pResponse; | 86 | import org .apache.ca talina.Htt pResponse; | 86 | import org .apache.ca talina.Htt pResponse; | |||||
| 81 | import org .apache.ca talina.Lif ecycle; | 87 | import org .apache.ca talina.Lif ecycle; | 87 | import org .apache.ca talina.Lif ecycle; | |||||
| 82 | import org .apache.ca talina.Lif ecycleEven t; | 88 | import org .apache.ca talina.Lif ecycleEven t; | 88 | import org .apache.ca talina.Lif ecycleEven t; | |||||
| 83 | import org .apache.ca talina.Lif ecycleExce ption; | 89 | import org .apache.ca talina.Lif ecycleExce ption; | 89 | import org .apache.ca talina.Lif ecycleExce ption; | |||||
| 84 | import org .apache.ca talina.Lif ecycleList ener; | 90 | import org .apache.ca talina.Lif ecycleList ener; | 90 | import org .apache.ca talina.Lif ecycleList ener; | |||||
| 85 | import org .apache.ca talina.Log ger; | 91 | import org .apache.ca talina.Log ger; | 91 | import org .apache.ca talina.Log ger; | |||||
| 86 | import org .apache.ca talina.Req uest; | 92 | import org .apache.ca talina.Req uest; | 92 | import org .apache.ca talina.Req uest; | |||||
| 87 | import org .apache.ca talina.Res ponse; | 93 | import org .apache.ca talina.Res ponse; | 93 | import org .apache.ca talina.Res ponse; | |||||
| 88 | import org .apache.ca talina.Ser vice; | 94 | import org .apache.ca talina.Ser vice; | 94 | import org .apache.ca talina.Ser vice; | |||||
| 89 | import org .apache.ca talina.net .DefaultSe rverSocket Factory; | 95 | import org .apache.ca talina.net .DefaultSe rverSocket Factory; | 95 | import org .apache.ca talina.net .DefaultSe rverSocket Factory; | |||||
| 90 | import org .apache.ca talina.net .ServerSoc ketFactory ; | 96 | import org .apache.ca talina.net .ServerSoc ketFactory ; | 96 | import org .apache.ca talina.net .ServerSoc ketFactory ; | |||||
| 91 | import org .apache.ca talina.uti l.Lifecycl eSupport; | 97 | import org .apache.ca talina.uti l.Lifecycl eSupport; | 97 | import org .apache.ca talina.uti l.Lifecycl eSupport; | |||||
| 92 | import org .apache.ca talina.uti l.StringMa nager; | 98 | import org .apache.ca talina.uti l.StringMa nager; | 98 | import org .apache.ca talina.uti l.StringMa nager; | |||||
| 93 | 99 | 99 | ||||||||
| 94 | 100 | 100 | ||||||||
| 95 | /** | 101 | /** | 101 | /** | |||||
| 96 | * Impleme ntation of an HTTP/1 .1 connect or. | 102 | * Impleme ntation of an HTTP/1 .1 connect or. | 102 | * Impleme ntation of an HTTP/1 .1 connect or. | |||||
| 97 | * | 103 | * | 103 | * | |||||
| 98 | * @author Craig R. McClanahan | 104 | * @author Craig R. McClanahan | 104 | * @author Craig R. McClanahan | |||||
| 99 | * @author Remy Mauc herat | 105 | * @author Remy Mauc herat | 105 | * @author Remy Mauc herat | |||||
| 100 |
*
@version
$Revision:
1.
2
4
.2.2
$
$Date:
2002/0
1/
3
|
106 |
*
@version
$Revision:
1.
3
4
|
106 | * @versio n $Revisio n: 1.34 $ $Date: 200 2/03/18 07 :15:39 $ | |||||
| 107 | * @deprec ated | 107 | * @deprec ated | |||||||
| 101 | */ | 108 | */ | 108 | */ | |||||
| 102 | 109 | 109 | ||||||||
| 103 | 110 | 110 | ||||||||
| 104 | public fin al class H ttpConnect or | 111 | public fin al class H ttpConnect or | 111 | public fin al class H ttpConnect or | |||||
| 105 | implem ents Conne ctor, Life cycle, Run nable { | 112 | implem ents Conne ctor, Life cycle, Run nable { | 112 | implem ents Conne ctor, Life cycle, Run nable { | |||||
| 106 | 113 | 113 | ||||||||
| 107 | 114 | 114 | ||||||||
| 108 | // --- ---------- ---------- ---------- ---------- ---------- Instance Variables | 115 | // --- ---------- ---------- ---------- ---------- ---------- Instance Variables | 115 | // --- ---------- ---------- ---------- ---------- ---------- Instance Variables | |||||
| 109 | 116 | 116 | ||||||||
| 110 | 117 | 117 | ||||||||
| 111 | /** | 118 | /** | 118 | /** | |||||
| 112 | * The <code>Ser vice</code > we are a ssociated with (if a ny). | 119 | * The <code>Ser vice</code > we are a ssociated with (if a ny). | 119 | * The <code>Ser vice</code > we are a ssociated with (if a ny). | |||||
| 113 | */ | 120 | */ | 120 | */ | |||||
| 114 | privat e Service service = null; | 121 | privat e Service service = null; | 121 | privat e Service service = null; | |||||
| 115 | 122 | 122 | ||||||||
| 116 | 123 | 123 | ||||||||
| 117 | /** | 124 | /** | 124 | /** | |||||
| 118 | * The accept co unt for th is Connect or. | 125 | * The accept co unt for th is Connect or. | 125 | * The accept co unt for th is Connect or. | |||||
| 119 | */ | 126 | */ | 126 | */ | |||||
| 120 | privat e int acce ptCount = 10; | 127 | privat e int acce < | |||||||