Produced by Araxis Merge on 2016-08-05 09:21:34 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. 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 | /Merge Test Files/jakarta-tomcat-4.0.6-src/catalina/src/share/org/apache/catalina/connector/http10 | LocalStrings.properties | 2002-10-08 14:15:34 +0000 |
| 2 | /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/connector/http10 | LocalStrings.properties | 2002-12-19 13:49:44 +0000 |
| 3 | /Merge Test Files/jakarta-tomcat-4.1.24-src/catalina/src/share/org/apache/catalina/connector/http10 | LocalStrings.properties | 2003-03-19 09:18:38 +0000 |
| 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 | 1 | 40 | 1 | 40 | ||
| Changed | 0 | 0 | 0 | 0 | 0 | 0 |
| Inserted | 0 | 0 | 0 | 0 | 0 | 0 |
| Removed | 0 | 0 | 0 | 0 | 0 | 0 |
| Note: An automatic merge would leave 0 conflict(s). | ||||||
| Whitespace | Differences in whitespace are significant |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are significant |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | httpConnector.alreadyInitialized=HTTP connector has already been initialized | 1 | httpConnector.alreadyInitialized=HTTP connector has already been initialized | 1 | httpConnector.alreadyInitialized=HTTP connector has already been initialized | |||||
| 2 | httpConnector.alreadyStarted=HTTP connector has already been started | 2 | httpConnector.alreadyStarted=HTTP connector has already been started | 2 | httpConnector.alreadyStarted=HTTP connector has already been started | |||||
| 3 | httpConnector.allAddresses=Opening server socket on all host IP addresses | 3 | httpConnector.allAddresses=Opening server socket on all host IP addresses | 3 | httpConnector.allAddresses=Opening server socket on all host IP addresses | |||||
| 4 | httpConnector.anAddress=Opening server socket on host IP address {0} | 4 | httpConnector.anAddress=Opening server socket on host IP address {0} | 4 | httpConnector.anAddress=Opening server socket on host IP address {0} | |||||
| 5 | httpConnector.noAddress=No host IP address matching {0}, opening on all addresses | 5 | httpConnector.noAddress=No host IP address matching {0}, opening on all addresses | 5 | httpConnector.noAddress=No host IP address matching {0}, opening on all addresses | |||||
| 6 | httpConnector.noProcessor=No processor available, rejecting this connection | 6 | httpConnector.noProcessor=No processor available, rejecting this connection | 6 | httpConnector.noProcessor=No processor available, rejecting this connection | |||||
| 7 | httpConnector.notStarted=HTTP connector has not yet been started | 7 | httpConnector.notStarted=HTTP connector has not yet been started | 7 | httpConnector.notStarted=HTTP connector has not yet been started | |||||
| 8 | httpConnector.starting=Starting background thread | 8 | httpConnector.starting=Starting background thread | 8 | httpConnector.starting=Starting background thread | |||||
| 9 | httpConnector.stopping=Stopping background thread | 9 | httpConnector.stopping=Stopping background thread | 9 | httpConnector.stopping=Stopping background thread | |||||
| 10 | httpProcessor.alreadyStarted=HTTP processor has already been started | 10 | httpProcessor.alreadyStarted=HTTP processor has already been started | 10 | httpProcessor.alreadyStarted=HTTP processor has already been started | |||||
| 11 | httpProcessor.notStarted=HTTP processor has not yet been started | 11 | httpProcessor.notStarted=HTTP processor has not yet been started | 11 | httpProcessor.notStarted=HTTP processor has not yet been started | |||||
| 12 | httpProcessor.parseHeaders.contentLength=Invalid 'Content-Length' header | 12 | httpProcessor.parseHeaders.contentLength=Invalid 'Content-Length' header | 12 | httpProcessor.parseHeaders.contentLength=Invalid 'Content-Length' header | |||||
| 13 | httpProcessor.parseHeaders.colon=Invalid HTTP header format | 13 | httpProcessor.parseHeaders.colon=Invalid HTTP header format | 13 | httpProcessor.parseHeaders.colon=Invalid HTTP header format | |||||
| 14 | httpProcessor.parseHeaders.portNumber=Invalid TCP/IP port number in 'Host' header | 14 | httpProcessor.parseHeaders.portNumber=Invalid TCP/IP port number in 'Host' header | 14 | httpProcessor.parseHeaders.portNumber=Invalid TCP/IP port number in 'Host' header | |||||
| 15 | httpProcessor.parseRequest.method=Missing HTTP request method | 15 | httpProcessor.parseRequest.method=Missing HTTP request method | 15 | httpProcessor.parseRequest.method=Missing HTTP request method | |||||
| 16 | httpProcessor.parseRequest.read=Missing HTTP request line | 16 | httpProcessor.parseRequest.read=Missing HTTP request line | 16 | httpProcessor.parseRequest.read=Missing HTTP request line | |||||
| 17 | httpProcessor.parseRequest.uri=Missing HTTP request URI | 17 | httpProcessor.parseRequest.uri=Missing HTTP request URI | 17 | httpProcessor.parseRequest.uri=Missing HTTP request URI | |||||
| 18 | httpProcessor.start=HTTP processor has already been started | 18 | httpProcessor.start=HTTP processor has already been started | 18 | httpProcessor.start=HTTP processor has already been started | |||||
| 19 | httpProcessor.starting=Starting background thread | 19 | httpProcessor.starting=Starting background thread | 19 | httpProcessor.starting=Starting background thread | |||||
| 20 | httpProcessor.stopping=Stopping background thread | 20 | httpProcessor.stopping=Stopping background thread | 20 | httpProcessor.stopping=Stopping background thread |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.