Produced by Araxis Merge on Mon Mar 6 17:40:22 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 | Constants.java | Tue Oct 8 15:15:36 2002 UTC |
| 2 | Mon Mar 6 17:40:22 2006 UTC | ||
| 3 | Mon Mar 6 17:40:22 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 | 410 |
| Removed | 1 | 410 | 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 | package or g.apache.c atalina.co nnector.wa rp; | |||||||||
| 58 | ||||||||||
| 59 | public cla ss Constan ts { | |||||||||
| 60 | /** Ou r package name. */ | |||||||||
| 61 | public static fi nal String PACKAGE=" org.apache .catalina. connector. warp"; | |||||||||
| 62 | ||||||||||
| 63 | /** Co mpile-in d ebug flag. */ | |||||||||
| 64 | public static fi nal boolea n DEBUG=fa lse; | |||||||||
| 65 | ||||||||||
| 66 | /** | |||||||||
| 67 | * The WARP prot ocol major version. | |||||||||
| 68 | */ | |||||||||
| 69 | public static fi nal int VE RS_MAJOR=0 ; | |||||||||
| 70 | ||||||||||
| 71 | /** | |||||||||
| 72 | * The WARP prot ocol minor version. | |||||||||
| 73 | */ | |||||||||
| 74 | public static fi nal int VE RS_MINOR=1 0; | |||||||||
| 75 | ||||||||||
| 76 | /** | |||||||||
| 77 | * INV ALID: The packet typ e hasn't b een set ye t. | |||||||||
| 78 | */ | |||||||||
| 79 | public static fi nal int TY PE_INVALID =-1; | |||||||||
| 80 | ||||||||||
| 81 | /** | |||||||||
| 82 | * ERR OR: The la st operati on didn't completed correctly. | |||||||||
| 83 | * <br > | |||||||||
| 84 | * Pay load descr iption:<br > | |||||||||
| 85 | * [st ring] An e rror messa ge.<br> | |||||||||
| 86 | */ | |||||||||
| 87 | public static fi nal int TY PE_ERROR=0 x00; | |||||||||
| 88 | ||||||||||
| 89 | /** | |||||||||
| 90 | * DIS CONNECT: T he connect ion is bei ng closed. | |||||||||
| 91 | * <br > | |||||||||
| 92 | * No payload:<b r> | |||||||||
| 93 | */ | |||||||||
| 94 | public static fi nal int TY PE_DISCONN ECT=0xfe; | |||||||||
| 95 | ||||||||||
| 96 | /** | |||||||||
| 97 | * FAT AL: A prot ocol error occourred , the conn ection mus t be close d. | |||||||||
| 98 | * <br > | |||||||||
| 99 | * Pay load descr iption:<br > | |||||||||
| 100 | * [st ring] An e rror messa ge.<br> | |||||||||
| 101 | */ | |||||||||
| 102 | public static fi nal int TY PE_FATAL=0 xff; | |||||||||
| 103 | ||||||||||
| 104 | /** | |||||||||
| 105 | * CON F_WELCOME: The serve r issues t his packet when a co nnection i s | |||||||||
| 106 | * ope ned. The s erver awai ts for con figuration informati on. | |||||||||
| 107 | * <br > | |||||||||
| 108 | * Pay load descr iption:<br > | |||||||||
| 109 | * [us hort] Majo r protocol version.< br> | |||||||||
| 110 | * [us hort] Mino r protocol version.< br> | |||||||||
| 111 | * [in teger] The server un ique-id.<b r> | |||||||||
| 112 | */ | |||||||||
| 113 | public static fi nal int TY PE_CONF_WE LCOME=0x01 ; | |||||||||
| 114 | ||||||||||
| 115 | /** | |||||||||
| 116 | * CON F_ENUM: Th e client r equests to the serve r to enume rate all | |||||||||
| 117 | * web -applicati ons availa ble for a specified virtual ho st. In res ponse | |||||||||
| 118 | * to this reque st, the se rver repli es with a set of CON F_ENUM mes sages | |||||||||
| 119 | * ter minated by a CONF_EN UM_DONE me ssage. | |||||||||
| 120 | * <br > | |||||||||
| 121 | * Pay load descr iption:<br > | |||||||||
| 122 | * [st ring] The virtual ho st name.<b r> | |||||||||
| 123 | * [us hort] The virtual ho st port.<b r> | |||||||||
| 124 | */ | |||||||||
| 125 | public static fi nal int TY PE_CONF_EN UM=0x02; | |||||||||
| 126 | ||||||||||
| 127 | /** | |||||||||
| 128 | * CON F_ENUM_APP L: The ser ver specif ies the na me of a we b-applicat ion | |||||||||
| 129 | * ava ilable for deploymen t in respo nse to a C ONF_ENUMER ATE messag e. | |||||||||
| 130 | * <br > | |||||||||
| 131 | * Pay load descr iption:<br > | |||||||||
| 132 | * [st ring] The web-applic ation name .<br> | |||||||||
| 133 | */ | |||||||||
| 134 | public static fi nal int TY PE_CONF_EN UM_APPL=0x 03; | |||||||||
| 135 | ||||||||||
| 136 | /** | |||||||||
| 137 | * CON F_ENUM_DON E: The ser ver specif ies all we b-applicat ion names | |||||||||
| 138 | * ava ilable for deploymen t for the host speci fied in th e CONF_ENU M | |||||||||
| 139 | * mes sage have been trans fered. | |||||||||
| 140 | * <br > | |||||||||
| 141 | * No payload:<b r> | |||||||||
| 142 | */ | |||||||||
| 143 | public static fi nal int TY PE_CONF_EN UM_DONE=0x 04; | |||||||||
| 144 | ||||||||||
| 145 | /** | |||||||||
| 146 | * CON F_DEPLOY: The client attempts deploy a w eb applica tion. | |||||||||
| 147 | * <br > | |||||||||
| 148 | * Pay load descr iption:<br > | |||||||||
| 149 | * [st ring] The applicatio n name.<br > | |||||||||
| 150 | * [st ring] The virtual ho st name.<b r> | |||||||||
| 151 | * [us hort] The virtual ho st port.<b r> | |||||||||
| 152 | * [st ring] The web-applic ation URL path.<br> | |||||||||
| 153 | */ | |||||||||
| 154 | public static fi nal int TY PE_CONF_DE PLOY=0x05; | |||||||||
| 155 | ||||||||||
| 156 | /** | |||||||||
| 157 | * CON F_APPLIC: The server replies t o a CONF_D EPLOY mess age with t he web | |||||||||
| 158 | * app lication i dentifier of the con figured ap plication. | |||||||||
| 159 | * <br > | |||||||||
| 160 | * Pay load descr iption:<br > | |||||||||
| 161 | * [in teger] The web appli cation uni que id for this serv er.<br> | |||||||||
| 162 | * [st ring] The web applic ation real path (whe re it's ex panded).<b r> | |||||||||
| 163 | */ | |||||||||
| 164 | public static fi nal int TY PE_CONF_AP PLIC=0x06; | |||||||||
| 165 | ||||||||||
| 166 | /** | |||||||||
| 167 | * CON F_MAP: The client re quests to the server to enumer ate all ma ppings | |||||||||
| 168 | * for a specifi ed web-app lication. The server replies t o this mes sage | |||||||||
| 169 | * wit h a serie of MAP_ALL OW and MAP _DENY pack ets, termi nated by a | |||||||||
| 170 | * MAP _DONE pack et. | |||||||||
| 171 | * <br > | |||||||||
| 172 | * Pay load descr iption:<br > | |||||||||
| 173 | * [in teger] The web appli cation uni que id for this serv er.<br> | |||||||||
| 174 | */ | |||||||||
| 175 | public static fi nal int TY PE_CONF_MA P=0x07; | |||||||||
| 176 | ||||||||||
| 177 | /** | |||||||||
| 178 | * CON F_MAP_ALLO W: The ser ver replie s to a CON F_MAP mess age with t his | |||||||||
| 179 | * pac ket to ind icate a ma pping to a static pa ge, or a r esource th at | |||||||||
| 180 | * can be served autonomou sly by the remote en d (the web server). | |||||||||
| 181 | * <br > | |||||||||
| 182 | * Pay load descr iption:<br > | |||||||||
| 183 | * [st ring] An u rl-pattern as define d by the S ervlet spe cification . | |||||||||
| 184 | */ | |||||||||
| 185 | public static fi nal int TY PE_CONF_MA P_ALLOW=0x 08; | |||||||||
| 186 | ||||||||||
| 187 | /** | |||||||||
| 188 | * CON F_MAP_DENY : The serv er replies to a CONF _MAP messa ge with th is | |||||||||
| 189 | * pac ket to ind icate a ma pping to a resource that must be served by | |||||||||
| 190 | * the server (s ervlet con tainer). | |||||||||
| 191 | * <br > | |||||||||
| 192 | * Pay load descr iption:<br > | |||||||||
| 193 | * [st ring] An u rl-pattern as define d by the S ervlet spe cification . | |||||||||
| 194 | */ | |||||||||
| 195 | public static fi nal int TY PE_CONF_MA P_DENY=0x0 9; | |||||||||
| 196 | ||||||||||
| 197 | /** | |||||||||
| 198 | * CON F_MAP_DONE : The serv er replies to a CONF _MAP messa ge with th is | |||||||||
| 199 | * pac ket to ind icate that all servl et mapping s have bee n successf ully | |||||||||
| 200 | * tra nsfered to the other end | |||||||||
| 201 | * <br > | |||||||||
| 202 | * No payload:<b r> | |||||||||
| 203 | */ | |||||||||
| 204 | public static fi nal int TY PE_CONF_MA P_DONE=0x0 a; | |||||||||
| 205 | ||||||||||
| 206 | /** | |||||||||
| 207 | * CON F_DONE: Cl ient issue s this mes sage when all config urations h ave been | |||||||||
| 208 | * pro cessed. | |||||||||
| 209 | * <br > | |||||||||
| 210 | * No payload:<b r> | |||||||||
| 211 | */ | |||||||||
| 212 | public static fi nal int TY PE_CONF_DO NE=0x0e; | |||||||||
| 213 | ||||||||||
| 214 | /** | |||||||||
| 215 | * CON F_PROCEED: Server is sues this message in response to a CONF_ DONE | |||||||||
| 216 | * mes sage, to a cknowledge its readi ness to ac cept reque sts. | |||||||||
| 217 | * <br > | |||||||||
| 218 | * No payload:<b r> | |||||||||
| 219 | */ | |||||||||
| 220 | public static fi nal int TY PE_CONF_PR OCEED=0x0f ; | |||||||||
| 221 | ||||||||||
| 222 | /** | |||||||||
| 223 | * REQ _INIT: The client re quests to the WARP s erver that a request is | |||||||||
| 224 | * abo ut to be p rocessed. | |||||||||
| 225 | * <br > | |||||||||
| 226 | * Pay load descr iption:<br > | |||||||||
| 227 | * [in teger] The web-appli cation uni que ID for this serv er.<br> | |||||||||
| 228 | * [st ring] The HTTP metho d used for this requ est.<br> | |||||||||
| 229 | * [st ring] The request UR I.<br> | |||||||||
| 230 | * [st ring] The request qu ery argume nts.<br> | |||||||||
| 231 | * [st ring] The request pr otocol (HT TP/1.0, HT TP/1.1...) .<br> | |||||||||
| 232 | */ | |||||||||
| 233 | public static fi nal int TY PE_REQ_INI T=0x10; | |||||||||
| 234 | ||||||||||
| 235 | /** | |||||||||
| 236 | * REQ _CONTENT: The mime c ontent typ e and leng th of this request. | |||||||||
| 237 | * <br > | |||||||||
| 238 | * Pay load descr iption:<br > | |||||||||
| 239 | * [st ring] The MIME conte nt type of this requ es.<br> | |||||||||
| 240 | * [in teger] The content l ength of t his reques t.<br> | |||||||||
| 241 | */ | |||||||||
| 242 | public static fi nal int TY PE_REQ_CON TENT=0x11; | |||||||||
| 243 | ||||||||||
| 244 | /** | |||||||||
| 245 | * REQ _SCHEME: T he scheme descriptio n of this request. | |||||||||
| 246 | * <br > | |||||||||
| 247 | * Pay load descr iption:<br > | |||||||||
| 248 | * [st ring] The scheme (pa rt before :// in the URL) of t his reques t.<br> | |||||||||
| 249 | */ | |||||||||