Skip to content

Directly honour robots.txt if htaccess.RewriteBase#31483

Merged
PVince81 merged 2 commits into
owncloud:masterfrom
benrubson:robots.txt
Apr 2, 2019
Merged

Directly honour robots.txt if htaccess.RewriteBase#31483
PVince81 merged 2 commits into
owncloud:masterfrom
benrubson:robots.txt

Conversation

@benrubson

Copy link
Copy Markdown
Contributor

Hi,

If htaccess.RewriteBase is set, then robots.txt can't be requested.
This PR then solves this issue.

Thank you 👍

Ben

@benrubson

Copy link
Copy Markdown
Contributor Author

I'm still facing this issue with 10.1.0.
Could we then think about merging this tiny patch please, so that it'll be in 10.1.1 ?
@DeepDiver1975, @PVince81, @phil-davis ? :)
Many thanks again 👍

@phil-davis

Copy link
Copy Markdown
Contributor

@ownclouders rebase

@ownclouders

Copy link
Copy Markdown
Contributor

Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently ⚠️

@ownclouders

Copy link
Copy Markdown
Contributor

Automated rebase failed! Please rebase your pull request manually via the command line.

Reason:

Command: git push --force origin HEAD:robots.txt

Exit Code: 1

Cause:

To <hidden_oauth_token>
 ! [remote rejected] HEAD -> robots.txt (shallow update not allowed)
error: failed to push some refs to '<hidden_oauth_token>'


@codecov

codecov Bot commented Feb 8, 2019

Copy link
Copy Markdown

Codecov Report

Merging #31483 into master will decrease coverage by 1.67%.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #31483      +/-   ##
============================================
- Coverage     64.78%    63.1%   -1.68%     
+ Complexity    18372    18271     -101     
============================================
  Files          1199     1147      -52     
  Lines         69565    70962    +1397     
  Branches       1281     1700     +419     
============================================
- Hits          45065    44778     -287     
- Misses        24127    25748    +1621     
- Partials        373      436      +63
Flag Coverage Δ Complexity Δ
#javascript 56.85% <ø> (+3.75%) 0 <ø> (ø) ⬇️
#phpunit 63.97% <0%> (-2.16%) 18271 <0> (-101)
Impacted Files Coverage Δ Complexity Δ
lib/private/Setup.php 16.43% <0%> (+0.07%) 49 <0> (ø) ⬇️
apps/files/lib/ActivityHelper.php 0% <0%> (-100%) 8% <0%> (ø)
...l/InsufficientDataForMeaningfulAnswerException.php 0% <0%> (-100%) 1% <0%> (ø)
lib/private/Files/External/Auth/Builtin.php 0% <0%> (-100%) 1% <0%> (ø)
.../private/Files/External/Auth/Password/Password.php 0% <0%> (-100%) 1% <0%> (ø)
...ib/private/Files/External/StorageModifierTrait.php 0% <0%> (-100%) 1% <0%> (ø)
lib/private/Files/External/Auth/NullMechanism.php 0% <0%> (-100%) 1% <0%> (ø)
apps/dav/lib/CalDAV/Plugin.php 0% <0%> (-92.31%) 2% <0%> (-5%)
lib/private/DB/MySqlTools.php 0% <0%> (-88.47%) 4% <0%> (-7%)
...ivate/Files/ObjectStore/HomeObjectStoreStorage.php 0% <0%> (-86.67%) 8% <0%> (ø)
... and 403 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46255e2...dc92b06. Read the comment docs.

@codecov

codecov Bot commented Feb 8, 2019

Copy link
Copy Markdown

Codecov Report

Merging #31483 into master will decrease coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #31483      +/-   ##
============================================
- Coverage     64.78%   64.77%   -0.01%     
  Complexity    18372    18372              
============================================
  Files          1199     1199              
  Lines         69565    69565              
  Branches       1281     1281              
============================================
- Hits          45065    45063       -2     
- Misses        24127    24129       +2     
  Partials        373      373
Flag Coverage Δ Complexity Δ
#javascript 53.09% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 66.13% <0%> (-0.01%) 18372 <0> (ø)
Impacted Files Coverage Δ Complexity Δ
lib/private/Setup.php 16.27% <0%> (-0.08%) 49 <0> (ø)
apps/files_trashbin/lib/Expiration.php 96.55% <0%> (-1.73%) 29% <0%> (ø)
...eratedfilesharing/lib/Controller/OcmController.php 66.06% <0%> (-0.21%) 30% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46255e2...dc92b06. Read the comment docs.

@benrubson

Copy link
Copy Markdown
Contributor Author

Thank you @phil-davis 👍
I then just rebased manually.

@benrubson

Copy link
Copy Markdown
Contributor Author

Still facing with 10.1.1...
Any news regarding this tiny thing please ?
Thank you again...

@PVince81 PVince81 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks safe 👍

please backport by branching off stable10 and sending a PR back to stable10 with this change

@benrubson

Copy link
Copy Markdown
Contributor Author

@PVince81, thank you very much 👍
Here is then the PR against stable10 : #34949
Thank you again !

@lock lock Bot locked as resolved and limited conversation to collaborators Apr 2, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants