Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SSL Certificate Checking and Grammar Fixes #479

Merged
merged 7 commits into from
Nov 12, 2019
Merged

SSL Certificate Checking and Grammar Fixes #479

merged 7 commits into from
Nov 12, 2019

Conversation

dandalton1
Copy link
Contributor

@dandalton1 dandalton1 commented Nov 18, 2018

  • Changed word spacing in bin/http-server to have aligned tabs
  • Removed double negative in SSL argument parsing (that is, removal of !!)
  • SSL attempts to stat SSL certificate and then SSL private key; this is made in case one is not supplied
  • Changed null-checking for cache control to also account for null, in case null is supplied
  • Removed a Node linting error where true should be a Boolean instead of a String
  • Prettier grammar on test script

Fixes #135

changed caching policy algorithm; fixed grammar in testing

Signed-off-by: Danny Dalton <daltond2@hawkmail.newpaltz.edu>
bin/http-server Outdated Show resolved Hide resolved
bin/http-server Outdated Show resolved Hide resolved
@thornjad thornjad added this to the v0.12.0 milestone Apr 17, 2019
@dandalton1
Copy link
Contributor Author

Yes, I can change the wording and re-submit the pull request if you need me to, or do it in a different PR.

@thornjad
Copy link
Member

No need to submit a new request, you can just make the changes here! There are a few merge conflicts as well, so you'll want to merge master.

Changed `could not stat` to `could not find`.
@dandalton1
Copy link
Contributor Author

Fixed merge conflicts and wording.

@dandalton1
Copy link
Contributor Author

Meant to update README to be tabular in a separate pull request. Eh, lemme know what you think

@dandalton1 dandalton1 changed the title SSL Certificate Checking and Grammar Fixes SSL Certificate Checking, Grammar Fixes, Tabular README Apr 19, 2019
@thornjad
Copy link
Member

Yeah the readme changes are significant and separate from the cert/key checking, so that should be its own PR

@dandalton1 dandalton1 changed the title SSL Certificate Checking, Grammar Fixes, Tabular README SSL Certificate Checking and Grammar Fixes Apr 19, 2019
@dandalton1
Copy link
Contributor Author

Sorry about that! I undid those changes, I'm still getting used to Git honestly. Should've honestly made a new branch on my end for it

@thornjad
Copy link
Member

No problem!

@thornjad thornjad merged commit cd0bbc8 into http-party:master Nov 12, 2019
@thornjad
Copy link
Member

I squashed because of the revert commits; better to have that all together. Thanks @dandalton1!

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.

crash when running http-server --ssl
2 participants