Produced by Araxis Merge on Mon Mar 6 17:40:23 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\http10\warp | WarpSSLData.java | Tue Oct 8 15:15:34 2002 UTC |
| 2 | Mon Mar 6 17:40:23 2006 UTC | ||
| 3 | Mon Mar 6 17:40:23 2006 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 | 0 | 0 | 0 | 0 | ||
| Changed | 0 | 0 | 0 | 0 | 0 | 0 |
| Inserted | 0 | 0 | 0 | 0 | 1 | 77 |
| Removed | 1 | 77 | 0 | 0 | 0 | 0 |
| 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 | /* ======= ========== ========== ========== ========== ========== ========== ====== * | |||||||||
| 2 | * * | |||||||||
| 3 | * T he Apache Software L icense, V ersion 1.1 * | |||||||||
| 4 | * * | |||||||||
| 5 | * Copyrigh t (c) 1999 -2001 The Apache Sof tware Foun dation. * | |||||||||
| 6 | * A ll rights reserved. * | |||||||||
| 7 | * * | |||||||||
| 8 | * ======= ========== ========== ========== ========== ========== ========== ====== * | |||||||||
| 9 | * * | |||||||||
| 10 | * Redistr ibution an d use in s ource and binary for ms, with or without modi- * | |||||||||
| 11 | * ficatio n, are per mitted pro vided that the follo wing condi tions are met: * | |||||||||
| 12 | * * | |||||||||
| 13 | * 1. Redi stribution s of sourc e code mu st retain the above copyright notice * | |||||||||
| 14 | * noti ce, this l ist of con ditions an d the foll owing disc laimer. * | |||||||||
| 15 | * * | |||||||||
| 16 | * 2. Redi stribution s in bina ry form must repr oduce the above cop yright * | |||||||||
| 17 | * noti ce, this list of co nditions and the fo llowing d isclaimer in the * | |||||||||
| 18 | * docu mentation and/or oth er materia ls provide d with the distribut ion. * | |||||||||
| 19 | * * | |||||||||
| 20 | * 3. The end-user d ocumentati on includ ed with th e redistri bution, i f any, * | |||||||||
| 21 | * must include t he followi ng acknowl egement: * | |||||||||
| 22 | * * | |||||||||
| 23 | * " This produ ct include s softwar e develope d by the Apache So ftware * | |||||||||
| 24 | * Foundation <http://w ww.apache. org/>." * | |||||||||
| 25 | * * | |||||||||
| 26 | * Alte rnately, t his acknow legement m ay appear in the sof tware itse lf, if * | |||||||||
| 27 | * and wherever s uch third- party ackn owlegement s normally appear. * | |||||||||
| 28 | * * | |||||||||
| 29 | * 4. The names "Th e Jakarta Project" , "Tomcat ", and " Apache So ftware * | |||||||||
| 30 | * Foun dation" m ust not be used to endorse or promote products d erived * | |||||||||
| 31 | * from this sof tware with out prior written permissio n. For w ritten * | |||||||||
| 32 | * perm ission, pl ease conta ct <apache @apache.or g>. * | |||||||||
| 33 | * * | |||||||||
| 34 | * 5. Prod ucts deriv ed from th is softwar e may not be called "Apache" n or may * | |||||||||
| 35 | * "Apa che" appea r in their names wit hout prior written p ermission of the * | |||||||||
| 36 | * Apac he Softwar e Foundati on. * | |||||||||
| 37 | * * | |||||||||
| 38 | * THIS SO FTWARE IS PROVIDED " AS IS" AND ANY EXPRE SSED OR IM PLIED WARR ANTIES * | |||||||||
| 39 | * INCLUDI NG, BUT NO T LIMITED TO, THE I MPLIED WAR RANTIES OF MERCHANTA BILITY * | |||||||||
| 40 | * AND FIT NESS FOR A PARTICUL AR PURPOSE ARE DISC LAIMED. I N NO EVENT SHALL * | |||||||||
| 41 | * THE APA CHE SOFTW ARE FOUND ATION OR ITS CONTRI BUTORS BE LIABLE F OR ANY * | |||||||||
| 42 | * DIRECT, INDIRECT , INCIDE NTAL, SPE CIAL, EXE MPLARY, O R CONSEQU ENTIAL * | |||||||||
| 43 | * DAMAGES (INCLUDIN G, BUT NO T LIMITED TO, PROCU REMENT OF SUBSTITUTE GOODS * | |||||||||
| 44 | * OR SERV ICES; LOS S OF USE, DATA, OR PROFITS; OR BUSINE SS INTERRU PTION) * | |||||||||
| 45 | * HOWEVER CAUSED AN D ON ANY THEORY O F LIABILI TY, WHETH ER IN CON TRACT, * | |||||||||
| 46 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENC E OR OTHER WISE) ARIS ING IN * | |||||||||
| 47 | * ANY WA Y OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * | |||||||||
| 48 | * POSSIBI LITY OF SU CH DAMAGE. * | |||||||||
| 49 | * * | |||||||||
| 50 | * ======= ========== ========== ========== ========== ========== ========== ====== * | |||||||||
| 51 | * * | |||||||||
| 52 | * This so ftware co nsists of voluntary contribut ions made by many i ndivi- * | |||||||||
| 53 | * duals o n behalf o f the Apa che Softwa re Foundat ion. For more infor mation * | |||||||||
| 54 | * on the Apache Sof tware Foun dation, pl ease see < http://www .apache.or g/>. * | |||||||||
| 55 | * * | |||||||||
| 56 | * ======= ========== ========== ========== ========== ========== ========== ====== */ | |||||||||
| 57 | ||||||||||
| 58 | package or g.apache.c atalina.co nnector.wa rp; | |||||||||
| 59 | ||||||||||
| 60 | /* | |||||||||
| 61 | * SSL mes sage handl ing. | |||||||||
| 62 | */ | |||||||||
| 63 | ||||||||||
| 64 | public cla ss WarpSSL Data { | |||||||||
| 65 | /** | |||||||||
| 66 | * Cip her use by the SSL. | |||||||||
| 67 | */ | |||||||||
| 68 | String ciph; | |||||||||
| 69 | /** | |||||||||
| 70 | * SSL session. | |||||||||
| 71 | */ | |||||||||
| 72 | String sess; | |||||||||
| 73 | /** | |||||||||
| 74 | * Siz e of the a lgorithm. (56-128) | |||||||||
| 75 | */ | |||||||||
| 76 | int si ze; | |||||||||
| 77 | } | |||||||||
Araxis Merge (but not this generated report) is Copyright © 1993-2005 Araxis Ltd (www.araxis.com). All rights reserved.