Skip to content

Conversation

@alexandre-daubois
Copy link
Member

Fix #10964

@ndossche
Copy link
Member

ndossche commented Aug 2, 2023

Fwiw, CI failed because of a deprecation that has been fixed in the meantime, but as you still use a very old 8.1 branch it's still there for you. Although it doesn't matter for this contribution, I think it's a good idea to update your local branches with upstream in case you want to do future contributions.

@alexandre-daubois
Copy link
Member Author

alexandre-daubois commented Aug 2, 2023

Oh yes, I thought I was up-to-date with the upstream. 8.1 is caught-up now 🙂

Copy link
Member

@ndossche ndossche left a comment

Choose a reason for hiding this comment

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

Minor nits, otherwise seems good to me. Thanks for tackling this!

.LP
If a PHP file is provided to the command line when the
built-in web server is used, it will be ued as the router script. This script
will be started at each HTTP request. The script output will is returned to the
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
will be started at each HTTP request. The script output will is returned to the
will be started at each HTTP request. The script output is returned to the

Copy link
Member Author

Choose a reason for hiding this comment

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

Both comments addressed, thanks! 🙂

passed by the \-t option.
.LP
If a PHP file is provided to the command line when the
built-in web server is used, it will be ued as the router script. This script
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
built-in web server is used, it will be ued as the router script. This script
built-in web server is used, it will be used as the router script. This script

browser, unless the router script returns the
.B false
value. If so, the built-in server falls back to the default behaviour, returning
the requested resource as-is by looking-up the files relative to the document
Copy link
Contributor

Choose a reason for hiding this comment

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

I think that it should be looking up instead of looking-up.

Copy link
Member Author

Choose a reason for hiding this comment

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

Updated, thanks Javier! 😃

Copy link
Member

@ndossche ndossche left a comment

Choose a reason for hiding this comment

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

LGTM, Thanks.
I'll take it in my merge queue for tonight.

@ndossche ndossche closed this in 997a367 Aug 3, 2023
jorgsowa pushed a commit to jorgsowa/php-src that referenced this pull request Aug 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants