Browse Source

Merge branch 'master' into 0.10.1

Ben Hsieh 8 years ago
parent
commit
5a3a3d57bd

+ 2
- 2
.github/PULL_REQUEST_TEMPLATE View File

1
 Thank you for making a pull request ! Just a gentle reminder :)
1
 Thank you for making a pull request ! Just a gentle reminder :)
2
 
2
 
3
-1. If the PR is offering a feature please make the request to our "Feature Branch" 0.10.0
4
-2. Bug fix request to "Bug Fix Branch" 0.10.0
3
+1. If the PR is offering a feature please make the request to our "Feature Branch" 0.11.0
4
+2. Bug fix request to "Bug Fix Branch" 0.10.1
5
 3. Correct README.md can directly to master
5
 3. Correct README.md can directly to master

+ 2
- 2
package.json View File

6
   "scripts": {
6
   "scripts": {
7
     "start": "node node_modules/react-native/local-cli/cli.js start",
7
     "start": "node node_modules/react-native/local-cli/cli.js start",
8
     "update-info": "sh scripts/contributors.sh",
8
     "update-info": "sh scripts/contributors.sh",
9
-    "test": "sh test.sh"
9
+    "test": "sh ./scrips/test.sh"
10
   },
10
   },
11
   "devDependencies": {
11
   "devDependencies": {
12
     "body-parser": "^1.15.0",
12
     "body-parser": "^1.15.0",
32
     "smartt <github@eriksmartt.com>",
32
     "smartt <github@eriksmartt.com>",
33
     ""
33
     ""
34
   ]
34
   ]
35
-}
35
+}

+ 1
- 1
src/android/src/main/java/com/RNFetchBlob/RNFetchBlobBody.java View File

235
             }
235
             }
236
             // data field
236
             // data field
237
             else {
237
             else {
238
-                header += "Content-Disposition: form-data; name=" + name + "\r\n";
238
+                header += "Content-Disposition: form-data; name=\"" + name + "\"\r\n";
239
                 header += "Content-Type: " + field.mime + "\r\n\r\n";
239
                 header += "Content-Type: " + field.mime + "\r\n\r\n";
240
                 os.write(header.getBytes());
240
                 os.write(header.getBytes());
241
                 byte[] fieldData = field.data.getBytes();
241
                 byte[] fieldData = field.data.getBytes();