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

Fix minify #541

Merged
merged 3 commits into from
Mar 11, 2012
Merged

Fix minify #541

merged 3 commits into from
Mar 11, 2012

Conversation

cweider
Copy link
Contributor

@cweider cweider commented Mar 4, 2012

Fixes #513 and #515 (for real this time).

This makes DOS attacks way to easy. This really needs to be replaced with an LRU (e.g. a prebuilt middleware).
@JohnMcLear
Copy link
Member

Sorry, I'm a bit behind in testing pull requests. Should get around to doing them all tomorrow.

-----Original Message-----
From: Chad Weider [mailto:reply@reply.github.com]
Sent: 04 March 2012 23:09
To: John McLear
Subject: [etherpad-lite] Fix minify (#541)

Fixes #513 and #515 (for real this time).

You can merge this Pull Request by running:

git pull https://github.com/cweider/etherpad-lite fix-minify

Or you can view, comment on it, or merge it online at:

https://github.com/Pita/etherpad-lite/pull/541

-- Commit Summary --

  • Avoid orphaned cache files from breaking the caching layer.
  • Handle Windows paths correctly (again).

-- File Changes --

M node/utils/Minify.js (4)
M node/utils/caching_middleware.js (2)

-- Patch Links --

https://github.com/Pita/etherpad-lite/pull/541.patch
https://github.com/Pita/etherpad-lite/pull/541.diff


Reply to this email directly or view it on GitHub:
https://github.com/Pita/etherpad-lite/pull/541
This email and its attachments may be confidential and are intended solely for the use of the individual to whom it is addressed. Any views or opinions expressed are solely those of the author and do not necessarily represent those of the organisation from which this email originated. If you are not the intended recipient of this email and its attachments, you must take no action based upon them, nor must you copy or show them to anyone. Please contact the sender if you believe you have received this email in error. This email was sent by School Email - Safe Webmail and Hosted Email for Schools

@JohnMcLear
Copy link
Member

The soonest I can test and pull this is Thursday. Two reasons

a) I'm really busy at the mo
b) We're not pulling any new code until the plugin framework is finally merged

@azul
Copy link
Contributor

azul commented Mar 6, 2012

The 57d0a2e fixes an issue I ran into as well. For me it causes etherpad-lite to crash on a restart if i have not touched all static files.
@johnyma22 MIght make sense to include it before the plugin merge.. it's a one line fix.

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