aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable-4.11' into stable-5.0Jonathan Nieder2018-10-071-2/+2
|\ | | | | | | | | | | | | | | * stable-4.11: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: If82e40c5a39b84c6a63e8cc10d168696c4eb3e91 Signed-off-by: Jonathan Nieder <jrn@google.com>
| * Merge branch 'stable-4.10' into stable-4.11Jonathan Nieder2018-10-071-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | * stable-4.10: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: Id2c8d1d4ffdf7bf18ef64479cfa1e959d9b2c37e Signed-off-by: Jonathan Nieder <jrn@google.com>
| | * Merge branch 'stable-4.9' into stable-4.10Jonathan Nieder2018-10-071-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: I847bdb9ef2b9e733c79489577b8b6e852ce6abf3 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | * Merge branch 'stable-4.8' into stable-4.9Jonathan Nieder2018-10-071-2/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: Ic73df5571e1ae86e5e026d0bf9d8e9e330cbfa97 Signed-off-by: Jonathan Nieder <jrn@google.com>
| | | | * Merge branch 'stable-4.7' into stable-4.8David Pursehouse2018-10-071-2/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: ObjectChecker#getGitsubmodules: Fix malformed javadoc Change-Id: I51ddd8fa1c2fbcabfb010bc4662d2c925563b55a Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | * ObjectChecker#getGitsubmodules: Fix malformed javadocDavid Pursehouse2018-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text "<tree, blob>" with angle brackets should not be used in javadoc since it is interpreted as an HTML tag and then rejected since it's not a valid HTML tag. Wrap the text in a @literal tag. Also add a missing space. Change-Id: Ide045e8c04a39a916f5b2e964e58c151e4555830 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
* | | | | | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-10-0612-15/+682
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.5-SNAPSHOT builds JGit v4.11.4.201810060650-r Fix configuration of maven-javadoc-plugin Prepare 4.9.7-SNAPSHOT builds JGit v4.9.6.201810051924-r Prepare 4.7.6-SNAPSHOT builds JGit v4.7.5.201810051826-r BaseReceivePack: Validate incoming .gitmodules files ObjectChecker: Report .gitmodules files found in the pack SubmoduleAddCommand: Reject submodule URIs that look like cli options * Fix configuration of maven-javadoc-plugin for site generation Change-Id: Ic6ff8d324867ee41f15a5b890c7eee5092e8453e Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Prepare 4.11.5-SNAPSHOT buildsMatthias Sohn2018-10-0656-356/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbe76e14264e8b547930e2320e8e81d728bd6e38 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | JGit v4.11.4.201810060650-rv4.11.4.201810060650-rMatthias Sohn2018-10-0656-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5700ebd341b6b997a7757b17e7d731c4ce608ec2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-10-061-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Fix configuration of maven-javadoc-plugin Change-Id: I80db074c45e840f15e227a400ef637b85084e711 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | Fix configuration of maven-javadoc-pluginMatthias Sohn2018-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since maven-javadoc-plugin additionalJOption replaces additionalparam to pass additional options to JavaDoc. See https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html#additionalJOption Change-Id: Iddff5873520a181bcb9edf285b0c8db532e930ee Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-10-0611-9/+682
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Prepare 4.9.7-SNAPSHOT builds JGit v4.9.6.201810051924-r Prepare 4.7.6-SNAPSHOT builds JGit v4.7.5.201810051826-r BaseReceivePack: Validate incoming .gitmodules files ObjectChecker: Report .gitmodules files found in the pack SubmoduleAddCommand: Reject submodule URIs that look like cli options Change-Id: Ibd759f5d425f714e79b3137ff8e5b0f989933de0 Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-10-0611-9/+682
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.9.7-SNAPSHOT builds JGit v4.9.6.201810051924-r Prepare 4.7.6-SNAPSHOT builds JGit v4.7.5.201810051826-r BaseReceivePack: Validate incoming .gitmodules files ObjectChecker: Report .gitmodules files found in the pack SubmoduleAddCommand: Reject submodule URIs that look like cli options Change-Id: Ie59e34eb591a827d1ce8e483eec6d390a3c81702 Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | Prepare 4.9.7-SNAPSHOT buildsMatthias Sohn2018-10-0656-333/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I20e7bd6bdebcdb55a8c771314759bd8f98f04ef6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | JGit v4.9.6.201810051924-rv4.9.6.201810051924-rMatthias Sohn2018-10-0656-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib39aaae26da17aa37d654b24c1defd45126f4ea2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2018-10-0611-10/+683
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Prepare 4.7.6-SNAPSHOT builds JGit v4.7.5.201810051826-r BaseReceivePack: Validate incoming .gitmodules files ObjectChecker: Report .gitmodules files found in the pack SubmoduleAddCommand: Reject submodule URIs that look like cli options Change-Id: Ia7a826399d8d5b8a0eb7169b40e98a6f5c207a4c Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2018-10-0611-10/+683
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Prepare 4.7.6-SNAPSHOT builds JGit v4.7.5.201810051826-r BaseReceivePack: Validate incoming .gitmodules files ObjectChecker: Report .gitmodules files found in the pack SubmoduleAddCommand: Reject submodule URIs that look like cli options Change-Id: Id6fabec4d0b682a7e20a46e88cbc05432efca062 Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Prepare 4.7.6-SNAPSHOT buildsMatthias Sohn2018-10-0656-321/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I99b59116999742d8d6cdba26287ea7c6eba11a30 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * JGit v4.7.5.201810051826-rv4.7.5.201810051826-rMatthias Sohn2018-10-0656-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I60c7a2eff3dab5083f71df0d9465a4e94b5e2513 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * BaseReceivePack: Validate incoming .gitmodules filesIvan Frade2018-10-055-1/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main concern are submodule urls starting with '-' that could pass as options to an unguarded tool. Pass through the parser the ids of blobs identified as .gitmodules files in the ObjectChecker. Load the blobs and parse/validate them in SubmoduleValidator. Change-Id: Ia0cc32ce020d288f995bf7bc68041fda36be1963 Signed-off-by: Ivan Frade <ifrade@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * ObjectChecker: Report .gitmodules files found in the packIvan Frade2018-10-054-7/+362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to validate .gitmodules files, we first need to find them in the incoming pack. Do it in the ObjectChecker stage. Check in the tree objects if they point to a .gitmodules file and report the tree id and the .gitmodules blob id. This can be used later to check if the file is in the root of the project and if the contents are good. While we're here, make isMacHFSGit more accurate by detecting variants of filenames that vary in case. [jn: tweaked NTFS and HFS+ checking; added more tests] Change-Id: I70802e7d2c1374116149de4f89836b9498f39582 Signed-off-by: Ivan Frade <ifrade@google.com> Signed-off-by: Jonathan Nieder <jrn@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * SubmoduleAddCommand: Reject submodule URIs that look like cli optionsIvan Frade2018-10-056-3/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In C git versions before 2.19.1, the submodule is fetched by running "git clone <uri> <path>". A URI starting with "-" would be interpreted as an option, causing security problems. See CVE-2018-17456. Refuse to add submodules with URIs, names or paths starting with "-", that could be confused with command line arguments. [jn: backported to JGit 4.7.y, bringing portions of Masaya Suzuki's dotdot check code in v5.1.0.201808281540-m3~57 (Add API to specify the submodule name, 2018-07-12) along for the ride] Change-Id: I2607c3acc480b75ab2b13386fe2cac435839f017 Signed-off-by: Ivan Frade <ifrade@google.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-09-261-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: Icacfa8dcd1ced32715fb772c336574318f28ddd1 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | Merge branch 'stable-4.10' into stable-4.11David Pursehouse2018-09-261-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: I2ab21595531bcd487ce6a5cb0a3bc3c6f6f6e518 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | | | Merge branch 'stable-4.9' into stable-4.10David Pursehouse2018-09-261-0/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: I3dff04d2ea99e5b6331e45e3ea2ccc78fb2d5a02 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * | | Merge branch 'stable-4.8' into stable-4.9David Pursehouse2018-09-261-0/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: Ie3de769209ec8477c97df5f90b8c63c03e023be0 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | * | Merge branch 'stable-4.7' into stable-4.8David Pursehouse2018-09-261-0/+4
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: ObjectDownloadListener#onWritePossible: Add comment on return statement Change-Id: Id0833112b0be4e78af375ee1fc78287743d7bc4c Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | * ObjectDownloadListener#onWritePossible: Add comment on return statementDavid Ostrovsky2018-09-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not obvious why this return statement is needed. Clarify with a comment that otherwise endless loop may show up when recent versions of Jetty are used. Change-Id: I8e5d4de51869fb1179bf599bfb81bcd7d745874b Signed-off-by: David Ostrovsky <david@ostrovsky.org>
* | | | | | Merge branch 'stable-4.11' into stable-5.0Matthias Sohn2018-09-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Prepare 4.11.4-SNAPSHOT builds JGit v4.11.3.201809181037-r Prepare 4.9.6-SNAPSHOT builds JGit v4.9.5.201809180939-r Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I3f43af45a4c9023f0e8638fa1920db5d69276502 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Prepare 4.11.4-SNAPSHOT buildsMatthias Sohn2018-09-1856-356/+356
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2f83eb3b2070637997cfece59f4f15698267908 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | JGit v4.11.3.201809181037-rv4.11.3.201809181037-rMatthias Sohn2018-09-1856-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b57b02e41f02916127b1866d573a634d6f6d796 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| * | | | | Merge branch 'stable-4.10' into stable-4.11Matthias Sohn2018-09-180-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Prepare 4.9.6-SNAPSHOT builds JGit v4.9.5.201809180939-r Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I6633f1e147444385c999a6ff1d443b8a07d08bfc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | * | | | Merge branch 'stable-4.9' into stable-4.10Matthias Sohn2018-09-180-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I19b9be956b4e9bb1bba303ad879baac250988e8e Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | Prepare 4.9.6-SNAPSHOT buildsMatthias Sohn2018-09-1856-333/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9fb8f6cc45409e0884b898187323ac91953754c3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | JGit v4.9.5.201809180939-rv4.9.5.201809180939-rMatthias Sohn2018-09-1856-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36199607f3ec6e8bb841e9d9eade12251312447c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | * | | Merge branch 'stable-4.8' into stable-4.9Matthias Sohn2018-09-180-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: Ic353f93864ca4aec315f398f5c3e047dcda23125 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | * | Merge branch 'stable-4.7' into stable-4.8Matthias Sohn2018-09-180-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Prepare 4.7.5-SNAPSHOT builds JGit v4.7.4.201809180905-r Update API problem filter Change-Id: I9a9abcd2e48e19295d537241c951308cd0210019 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Prepare 4.7.5-SNAPSHOT buildsMatthias Sohn2018-09-1856-321/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifce4311fe9429d751cec5b326b540d6233762153 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * JGit v4.7.4.201809180905-rv4.7.4.201809180905-rMatthias Sohn2018-09-1856-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iceee69df5fd593bece4532d5781e3771f5761ef8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Update API problem filterMatthias Sohn2018-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie15c7d0b320f75915c362f5bd3bd6b39d84a900a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
* | | | | | Merge branch 'stable-4.11' into stable-5.0David Pursehouse2018-09-184-20/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.11: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Iffe202a412b3bca1c8d8d7dc5dfd646c49838de9 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| * | | | | Merge branch 'stable-4.10' into stable-4.11David Pursehouse2018-09-184-20/+39
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.10: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: I28ebf6138ccd9425fc05319de78c7716f0bdd199 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | * | | | Merge branch 'stable-4.9' into stable-4.10David Pursehouse2018-09-184-20/+39
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.9: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Ib7d01cb0ece8b259156855045a53b8baf3fa2968 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | * | | Merge branch 'stable-4.8' into stable-4.9David Pursehouse2018-09-184-20/+39
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.8: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Id8eb635094336567d9f3c28ec985cd5127d31632 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | * | Merge branch 'stable-4.7' into stable-4.8David Pursehouse2018-09-184-20/+39
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * stable-4.7: Fix ObjectUploadListener#close Fix error handling in FileLfsServlet ObjectDownloadListener#onWritePossible: Make code spec compatible ObjectDownloadListener: Return from onWritePossible when data is written Fix IOException when LockToken#close fails Change-Id: Iad9836811be034cf992ea25dad4409addba75115 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
| | | | | * Fix ObjectUploadListener#closeMatthias Sohn2018-09-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not try to set response status if response is already committed. Change-Id: I9a7c2871c86eb53416b905324775f3ed961c8ae6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * Fix error handling in FileLfsServletMatthias Sohn2018-09-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check in #sendError method if the response was committed already. If yes we cannot set response status or send an error message, last resort is to close the outputstream. If the response wasn't yet committed first reset the response before using writer to send the error message to the client since mixing STREAM and WRITE mode (mixing asynchronous and blocking I/O) is illegal in servlet 3.1. see the following bugs in the gerrit and jetty issue trackers https://bugs.chromium.org/p/gerrit/issues/detail?id=9667 https://bugs.chromium.org/p/gerrit/issues/detail?id=9721 https://github.com/eclipse/jetty.project/issues/2911 Change-Id: Ie35563c2e0ac1c5e918185a746622589a880dc7f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * ObjectDownloadListener#onWritePossible: Make code spec compatibleDavid Ostrovsky2018-09-171-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current code violates the ServletOutputStream contract. For every out.isReady() == true either write or close of that ServletOutputStream should be called. See also this issue upstream for more context: [1]. [1] https://github.com/eclipse/jetty.project/issues/2911 Change-Id: Ied575f3603a6be0d2dafc6c3329d685fc212c7a3 Signed-off-by: David Ostrovsky <david@ostrovsky.org> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| | | | | * ObjectDownloadListener: Return from onWritePossible when data is writtenDavid Ostrovsky2018-09-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When buffer was written not only call AsyncContext#complete() but also return from the ObjectDownloadListener#onWritePossible(). This avoids endless loop after upgrading from Jetty 9.3.x to 9.4.x lines. In Jetty example implementation:[1] the return statemnt is also used: // If we are at EOF then complete   if (len < 0)   {    async.complete();     return;   } See also this issue upstream: [2]. [1] https://webtide.com/servlet-3-1-async-io-and-jetty [2] https://github.com/eclipse/jetty.project/issues/2911 Change-Id: Iac73fb25e67d40228a378a8e34103f1d28b72a76 Signed-off-by: David Ostrovsky <david@ostrovsky.org>
| | | | | * Fix IOException when LockToken#close failsMatthias Sohn2018-09-151-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happened if the LockTokens hard link was already deleted earlier. Bug: 531759 Change-Id: Idc84bd695fac1a763b3cbb797c9c4c636a16e329 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 05:22:16 +0000