cvs commit: jakarta-struts/src/share/org/apache/struts/upload MultipartIterator.java

2001-07-06 Thread mschachter 

mschachter01/07/06 13:00:03

  Modified:src/share/org/apache/struts/upload Tag: STRUTS_1_0_BRANCH
MultipartIterator.java
  Log:
   - Fix for bug #2457
  
Eric Cifreo
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.13.2.3  +1 -1  
jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java
  
  Index: MultipartIterator.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java,v
  retrieving revision 1.13.2.2
  retrieving revision 1.13.2.3
  diff -u -r1.13.2.2 -r1.13.2.3
  --- MultipartIterator.java2001/07/02 20:14:17 1.13.2.2
  +++ MultipartIterator.java2001/07/06 20:00:01 1.13.2.3
  @@ -147,7 +147,7 @@
   }
   else {
   //default to system-wide tempdir
  -tempDir = System.getProperty(java.io.tmpdir);
  +this.tempDir = System.getProperty(java.io.tmpdir);
   }
   parseRequest();
   }

cvs commit: jakarta-struts/src/share/org/apache/struts/upload MultipartIterator.java

2001-06-13 Thread martinc 

martinc 01/06/13 18:11:29

  Modified:src/share/org/apache/struts/upload Tag: STRUTS_1_0_BRANCH
MultipartIterator.java
  Log:
  Fixed a bug which could cause corruption of an uploaded file. If the file
  contained the sequence \r\n\n, it would be transformed to \r\n\r\n on
  upload.
  
  Patch supplied by Markus Pallo - thanks!
  
  Revision  ChangesPath
  No   revision
  
  
  No   revision
  
  
  1.13.2.1  +1 -3  
jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java
  
  Index: MultipartIterator.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- MultipartIterator.java2001/05/10 00:56:54 1.13
  +++ MultipartIterator.java2001/06/14 01:11:28 1.13.2.1
  @@ -497,13 +497,11 @@
   if (cutNewline) {
   fos.write('\n');
   }
  +cutCarriage = false;
   if (bytesRead  0) {
   if (lineBuffer[bytesRead-1] == '\r') {
   bytesRead--;
   cutCarriage = true;
  -}
  -else {
  -cutCarriage = false;
   }
   }
   cutNewline = true;

cvs commit: jakarta-struts/src/share/org/apache/struts/upload MultipartIterator.java

2001-06-13 Thread martinc 

martinc 01/06/13 18:12:15

  Modified:src/share/org/apache/struts/upload MultipartIterator.java
  Log:
  Port the fix for file upload corruption.
  
  Revision  ChangesPath
  1.14  +1 -3  
jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java
  
  Index: MultipartIterator.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- MultipartIterator.java2001/05/10 00:56:54 1.13
  +++ MultipartIterator.java2001/06/14 01:12:14 1.14
  @@ -497,13 +497,11 @@
   if (cutNewline) {
   fos.write('\n');
   }
  +cutCarriage = false;
   if (bytesRead  0) {
   if (lineBuffer[bytesRead-1] == '\r') {
   bytesRead--;
   cutCarriage = true;
  -}
  -else {
  -cutCarriage = false;
   }
   }
   cutNewline = true;