You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by Tom Jordahl <to...@macromedia.com> on 2002/09/12 22:27:45 UTC
RE: cvs commit: xml-axis/java/src/org/apache/axis/transport/http
HTTPSender.java
Chris,
Two things:
- The string should be Axis 1.0, no point in putting the RC1 string in there now.
- Your submits have an awful lot of white space diffs, please check the diffs
BEFORE submitting to avoid it. There was just a mail thread on this.
Thanks!
--
Tom Jordahl
-----Original Message-----
From: haddadc@apache.org [mailto:haddadc@apache.org]
Sent: Thursday, September 12, 2002 12:04 AM
To: xml-axis-cvs@apache.org
Subject: cvs commit: xml-axis/java/src/org/apache/axis/transport/http
HTTPSender.java
haddadc 2002/09/11 21:03:45
Modified: java/src/org/apache/axis/transport/http HTTPSender.java
Log:
modified HTTP-UserAgent to Axis/RC1
fixes bug #12530 reported by thomas@boerkel.de (Thomas Boerkel)
Revision Changes Path
1.84 +5 -5 xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java
Index: HTTPSender.java
===================================================================
RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- HTTPSender.java 9 Sep 2002 17:03:21 -0000 1.83
+++ HTTPSender.java 12 Sep 2002 04:03:45 -0000 1.84
@@ -330,7 +330,7 @@
String val = me.getValue().toString();
if (null != val && val.trim().equalsIgnoreCase(HTTPConstants.HEADER_EXPECT_100_Continue))
httpContinueExpected = true;
- }
+ }
otherHeaders.append(key).append(": ").append(me.getValue()).append("\r\n");
}
@@ -360,7 +360,7 @@
.append("\r\n")
.append(HTTPConstants.HEADER_USER_AGENT) //Tell who we are.
.append( ": ")
- .append("Axis/beta3")
+ .append("Axis/RC1")
.append("\r\n")
.append(HTTPConstants.HEADER_HOST) //used for virtual connections
.append(": ")
@@ -415,7 +415,7 @@
if(httpContinueExpected ){ //We need to get a reply from the server as to whether
// it wants us send anything more.
out.flush();
- Hashtable cheaders= new Hashtable ();
+ Hashtable cheaders= new Hashtable ();
inp=readFromSocket(sock, msgContext, null, cheaders);
int returnCode= -1;
Integer Irc= (Integer)msgContext.getProperty(HTTPConstants.MC_HTTP_STATUS_CODE);
@@ -426,7 +426,7 @@
msgContext.removeProperty(HTTPConstants.MC_HTTP_STATUS_MESSAGE);
}
else{ //If no 100 Continue then we must not send anything!
- String statusMessage= (String)
+ String statusMessage= (String)
msgContext.getProperty(HTTPConstants.MC_HTTP_STATUS_MESSAGE);
AxisFault fault = new AxisFault("HTTP", "(" + returnCode+ ")" + statusMessage, null, null);
@@ -452,7 +452,7 @@
if(httpContinueExpected ){ //We need to get a reply from the server as to whether
// it wants us send anything more.
out.flush();
- Hashtable cheaders= new Hashtable ();
+ Hashtable cheaders= new Hashtable ();
inp=readFromSocket(sock, msgContext, null, cheaders);
int returnCode= -1;
Integer Irc= (Integer) msgContext.getProperty(HTTPConstants.MC_HTTP_STATUS_CODE);
RE: cvs commit: xml-axis/java/src/org/apache/axis/transport/http
HTTPSender.java
Posted by Chris Haddad <ha...@apache.org>.
Tom -
To be clear, do you desire 'Axis/1.0' or 'Axis 1.0'?
My editor was set to the following:
1) 'strip trailing whitespace'
2) '2 spaces per tab'
3) 'convert new tabs to spaces'
4) 'convert existing tabs to spaces'
I'm going to change #2 to '4 spaces per tab' as per the discussion on the
list. But otherwise, it is my understanding that any future white space
diffs conforming to this config will be a due to files previously
formatted improperly.
Would this be correct? Has anyone swept the code base and fixed any files
that don't conform to the norm?
Most likely the diff was a result of my editor 'stripping trailing
whitespace' and/or 'converting existing tabs to spaces' because I didn't
touch the lines in question. Should I turn these 'features' off to stay
the diffs or keep them on to clean the code as we go?
/Chris
On Thu, 12 Sep 2002, Tom Jordahl wrote:
>
> Chris,
>
> Two things:
>
> - The string should be Axis 1.0, no point in putting the RC1 string in there now.
> - Your submits have an awful lot of white space diffs, please check the diffs
> BEFORE submitting to avoid it. There was just a mail thread on this.
>
> Thanks!
>
> --
> Tom Jordahl
>
>
> -----Original Message-----
> From: haddadc@apache.org [mailto:haddadc@apache.org]
> Sent: Thursday, September 12, 2002 12:04 AM
> To: xml-axis-cvs@apache.org
> Subject: cvs commit: xml-axis/java/src/org/apache/axis/transport/http
> HTTPSender.java
>
>
> haddadc 2002/09/11 21:03:45
>
> Modified: java/src/org/apache/axis/transport/http HTTPSender.java
> Log:
> modified HTTP-UserAgent to Axis/RC1
>
> fixes bug #12530 reported by thomas@boerkel.de (Thomas Boerkel)
>
> Revision Changes Path
> 1.84 +5 -5 xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java
>
> Index: HTTPSender.java
> ===================================================================
> RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v
> retrieving revision 1.83
> retrieving revision 1.84
> diff -u -r1.83 -r1.84
> --- HTTPSender.java 9 Sep 2002 17:03:21 -0000 1.83
> +++ HTTPSender.java 12 Sep 2002 04:03:45 -0000 1.84
> @@ -330,7 +330,7 @@
> String val = me.getValue().toString();
> if (null != val && val.trim().equalsIgnoreCase(HTTPConstants.HEADER_EXPECT_100_Continue))
> httpContinueExpected = true;
> - }
> + }
>
> otherHeaders.append(key).append(": ").append(me.getValue()).append("\r\n");
> }
> @@ -360,7 +360,7 @@
> .append("\r\n")
> .append(HTTPConstants.HEADER_USER_AGENT) //Tell who we are.
> .append( ": ")
> - .append("Axis/beta3")
> + .append("Axis/RC1")
> .append("\r\n")
> .append(HTTPConstants.HEADER_HOST) //used for virtual connections
> .append(": ")
> @@ -415,7 +415,7 @@
> if(httpContinueExpected ){ //We need to get a reply from the server as to whether
> // it wants us send anything more.
> out.flush();
> - Hashtable cheaders= new Hashtable ();
> + Hashtable cheaders= new Hashtable ();
> inp=readFromSocket(sock, msgContext, null, cheaders);
> int returnCode= -1;
> Integer Irc= (Integer)msgContext.getProperty(HTTPConstants.MC_HTTP_STATUS_CODE);
> @@ -426,7 +426,7 @@
> msgContext.removeProperty(HTTPConstants.MC_HTTP_STATUS_MESSAGE);
> }
> else{ //If no 100 Continue then we must not send anything!
> - String statusMessage= (String)
> + String statusMessage= (String)
> msgContext.getProperty(HTTPConstants.MC_HTTP_STATUS_MESSAGE);
>
> AxisFault fault = new AxisFault("HTTP", "(" + returnCode+ ")" + statusMessage, null, null);
> @@ -452,7 +452,7 @@
> if(httpContinueExpected ){ //We need to get a reply from the server as to whether
> // it wants us send anything more.
> out.flush();
> - Hashtable cheaders= new Hashtable ();
> + Hashtable cheaders= new Hashtable ();
> inp=readFromSocket(sock, msgContext, null, cheaders);
> int returnCode= -1;
> Integer Irc= (Integer) msgContext.getProperty(HTTPConstants.MC_HTTP_STATUS_CODE);
>
>
>
>