Produced by Araxis Merge on 2016-08-05 09:21:32 +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/http | LocalStrings.properties | 2002-10-08 14:15:36 +0000 |
| 2 | /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/connector/http | 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/http | 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 | 72 | 1 | 72 | ||
| 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 | # $Id: LocalStrings.properties,v 1.4 2001/07/22 18:38:04 pier Exp $ | 1 | # $Id: LocalStrings.properties,v 1.4 2001/07/22 18:38:04 pier Exp $ | 1 | # $Id: LocalStrings.properties,v 1.4 2001/07/22 18:38:04 pier Exp $ | |||||
| 2 | 2 | 2 | ||||||||
| 3 | # language | 3 | # language | 3 | # language | |||||
| 4 | 4 | 4 | ||||||||
| 5 | # package org.apache.catalina.connector.http | 5 | # package org.apache.catalina.connector.http | 5 | # package org.apache.catalina.connector.http | |||||
| 6 | 6 | 6 | ||||||||
| 7 | 7 | 7 | ||||||||
| 8 | httpConnector.alreadyInitialized=HTTP connector has already been initialized | 8 | httpConnector.alreadyInitialized=HTTP connector has already been initialized | 8 | httpConnector.alreadyInitialized=HTTP connector has already been initialized | |||||
| 9 | httpConnector.alreadyStarted=HTTP connector has already been started | 9 | httpConnector.alreadyStarted=HTTP connector has already been started | 9 | httpConnector.alreadyStarted=HTTP connector has already been started | |||||
| 10 | httpConnector.allAddresses=Opening server socket on all host IP addresses | 10 | httpConnector.allAddresses=Opening server socket on all host IP addresses | 10 | httpConnector.allAddresses=Opening server socket on all host IP addresses | |||||
| 11 | httpConnector.failedSocketFactoryLoading=Failed to load socket factory | 11 | httpConnector.failedSocketFactoryLoading=Failed to load socket factory | 11 | httpConnector.failedSocketFactoryLoading=Failed to load socket factory | |||||
| 12 | httpConnector.failedToCreateSocket=Socket factory failed to create socket | 12 | httpConnector.failedToCreateSocket=Socket factory failed to create socket | 12 | httpConnector.failedToCreateSocket=Socket factory failed to create socket | |||||
| 13 | httpConnector.anAddress=Opening server socket on host IP address {0} | 13 | httpConnector.anAddress=Opening server socket on host IP address {0} | 13 | httpConnector.anAddress=Opening server socket on host IP address {0} | |||||
| 14 | httpConnector.noAddress=No host IP address matching {0}, opening on all addresses | 14 | httpConnector.noAddress=No host IP address matching {0}, opening on all addresses | 14 | httpConnector.noAddress=No host IP address matching {0}, opening on all addresses | |||||
| 15 | httpConnector.noProcessor=No processor available, rejecting this connection | 15 | httpConnector.noProcessor=No processor available, rejecting this connection | 15 | httpConnector.noProcessor=No processor available, rejecting this connection | |||||
| 16 | httpConnector.notStarted=HTTP connector has not yet been started | 16 | httpConnector.notStarted=HTTP connector has not yet been started | 16 | httpConnector.notStarted=HTTP connector has not yet been started | |||||
| 17 | httpConnector.starting=Starting background thread | 17 | httpConnector.starting=Starting background thread | 17 | httpConnector.starting=Starting background thread | |||||
| 18 | httpConnector.stopping=Stopping background thread | 18 | httpConnector.stopping=Stopping background thread | 18 | httpConnector.stopping=Stopping background thread | |||||
| 19 | httpProcessor.alreadyStarted=HTTP processor has already been started | 19 | httpProcessor.alreadyStarted=HTTP processor has already been started | 19 | httpProcessor.alreadyStarted=HTTP processor has already been started | |||||
| 20 | httpProcessor.notStarted=HTTP processor has not yet been started | 20 | httpProcessor.notStarted=HTTP processor has not yet been started | 20 | httpProcessor.notStarted=HTTP processor has not yet been started | |||||
| 21 | httpProcessor.parseHeaders.contentLength=Invalid 'Content-Length' header | 21 | httpProcessor.parseHeaders.contentLength=Invalid 'Content-Length' header | 21 | httpProcessor.parseHeaders.contentLength=Invalid 'Content-Length' header | |||||
| 22 | httpProcessor.parseHeaders.colon=Invalid HTTP header format | 22 | httpProcessor.parseHeaders.colon=Invalid HTTP header format | 22 | httpProcessor.parseHeaders.colon=Invalid HTTP header format | |||||
| 23 | httpProcessor.parseHeaders.portNumber=Invalid TCP/IP port number in 'Host' header | 23 | httpProcessor.parseHeaders.portNumber=Invalid TCP/IP port number in 'Host' header | 23 | httpProcessor.parseHeaders.portNumber=Invalid TCP/IP port number in 'Host' header | |||||
| 24 | httpProcessor.parseRequest.decode=Cannot decode HTTP request URI | 24 | httpProcessor.parseRequest.decode=Cannot decode HTTP request URI | 24 | httpProcessor.parseRequest.decode=Cannot decode HTTP request URI | |||||
| 25 | httpProcessor.parseRequest.method=Missing HTTP request method | 25 | httpProcessor.parseRequest.method=Missing HTTP request method | 25 | httpProcessor.parseRequest.method=Missing HTTP request method | |||||
| 26 | httpProcessor.parseRequest.read=Missing HTTP request line | 26 | httpProcessor.parseRequest.read=Missing HTTP request line | 26 | httpProcessor.parseRequest.read=Missing HTTP request line | |||||
| 27 | httpProcessor.parseRequest.uri=Missing HTTP request URI | 27 | httpProcessor.parseRequest.uri=Missing HTTP request URI | 27 | httpProcessor.parseRequest.uri=Missing HTTP request URI | |||||
| 28 | httpProcessor.parseHeaders.unknownExpectation=Unknown Expect header field | 28 | httpProcessor.parseHeaders.unknownExpectation=Unknown Expect header field | 28 | httpProcessor.parseHeaders.unknownExpectation=Unknown Expect header field | |||||
| 29 | httpProcessor.start=HTTP processor has already been started | 29 | httpProcessor.start=HTTP processor has already been started | 29 | httpProcessor.start=HTTP processor has already been started | |||||
| 30 | httpProcessor.starting=Starting background thread | 30 | httpProcessor.starting=Starting background thread | 30 | httpProcessor.starting=Starting background thread | |||||
| 31 | httpProcessor.stopping=Stopping background thread | 31 | httpProcessor.stopping=Stopping background thread | 31 | httpProcessor.stopping=Stopping background thread | |||||
| 32 | requestStream.close.closed=Request stream has already been closed | 32 | requestStream.close.closed=Request stream has already been closed | 32 | requestStream.close.closed=Request stream has already been closed | |||||
| 33 | requestStream.read.closed=Unable to read from a closed stream | 33 | requestStream.read.closed=Unable to read from a closed stream | 33 | requestStream.read.closed=Unable to read from a closed stream | |||||
| 34 | requestStream.read.error=Unexpected end of stream | 34 | requestStream.read.error=Unexpected end of stream | 34 | requestStream.read.error=Unexpected end of stream | |||||
| 35 | requestStream.readline.error=Couldn't read line | 35 | requestStream.readline.error=Couldn't read line | 35 | requestStream.readline.error=Couldn't read line | |||||
| 36 | requestStream.readline.toolong=Line too long | 36 | requestStream.readline.toolong=Line too long | 36 | requestStream.readline.toolong=Line too long |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.