summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-15couch, level, mongo, postgres, redis DB supportJohn McLear
Support for additional underlying databases
2012-10-11Update src/package.jsonJohn McLear
Bump version #
2012-10-11Merge pull request #1059 from lepidum/developJohn McLear
Fix for #1032 caused by pull-request 999
2012-10-11Merge pull request #3 from ayokura/fix-international-compositionlepidum
fix Pita/etherpad-lite #1032 (International composition (e.g. Japanese Input))
2012-10-12fix Pita/etherpad-lite #1032NAGOYA, Yoshihiko
refact inInternationalComposition
2012-10-11Merge pull request #1035 from amtep/developJohn McLear
Guard against malicious clients in USERINFO_UPDATE handling
2012-10-11Merge pull request #1057 from dmitryuv/sync-processingMarcel Klehr
fix for error handling in the callback code
2012-10-11fix for error handling in callback codeDmitry
The callback code does not follow error handling guidelines, thus always receiving NULL instead of results array.
2012-10-11Merge pull request #1056 from dmitryuv/sync-processingMarcel Klehr
Fix variable name in handleMessageHook
2012-10-11fixed variable name in handleMessageHookDmitry
the code would never work as expected with this type
2012-10-09Merge pull request #1049 from cweider/fix-expressJohn McLear
Drop method deprecated in Express 3.x.
2012-10-09Drop method deprecated in Express 3.x.Chad Weider
2012-10-06Remove two instances of the same function nameJohn McLear
Both functions did the same thing, the first function was buggy.  Might be worth someone looking through the history of this file and pointing out when I made this heinous error ;)
2012-10-05Merge pull request #1034 from d-a-n/developJohn McLear
Added hooks for pad events create/edit/load/remove
2012-10-04Merge pull request #1004 from yourcelf/developJohn McLear
Add `userColor` query param to set initial color
2012-10-04Fix issue caused by broken async updatejohnyma22
2012-10-03Merge pull request #1003 from Pita/express-v3John McLear
Upgrade Express to v3 [proposal]
2012-10-03Merge pull request #1038 from cweider/fix-relativeJohn McLear
Upgrade to Yajsml bug fix.
2012-10-03Changed pad_id to padID to follow projct standards.d-a-n
2012-10-03Changed pad_id to padID to follow projct standards.d-a-n
2012-10-03Changed pad hook names to follow naming conventions. Arguments will now be ↵d-a-n
passed as hash.
2012-10-03Changed pad hook names to follow naming conventions.d-a-n
2012-10-03Merge branch 'develop' into express-v3Marcel Klehr
Conflicts: src/node/hooks/express/errorhandling.js
2012-10-02Upgrade to Yajsml bug fix.Chad Weider
2012-10-02USERINFO_UPDATE: construct a new message for broadcastRichard Braakman
The server was reusing the client's message when broadcasting userinfo updates. This would allow a malicious client to insert arbitrary fields into a message that the other clients would trust as coming from the server. For example, adding "disconnect" or renaming other authors. This commit fixes it by having the server construct a new message with known fields before broadcasting.
2012-10-02Updated docs for new pad hooks (add, edit, remove)d-a-n
2012-10-02Added pad hooks (create, load, edit, remove)d-a-n
2012-10-02Updated docs for new pad hooks (add, edit, remove)d-a-n
2012-10-02Updated docs for new pad hooks (add, edit, remove)d-a-n
2012-10-02Merge pull request #1031 from gedion/developJohn McLear
Update docs for new hooks and ace exposures
2012-10-02Merge pull request #1033 from marcelklehr/fix/shutdown-on-middlware-errorJohn McLear
Don't shut down the whole server, if error handling middleware is called...
2012-10-02Don't shut down the whole server, if error handling middleware is called.Marcel Klehr
The errors passed to error handling middleware aren't that severe, so it's fine to just stay alive...
2012-10-02Update src/static/js/pad_editbar.jsJohn McLear
Somehow </iframe> was no more.  Now it is back..  Oh boy.
2012-10-01added comments to ace exposed methodsGedion
2012-10-01added comments to ace exposed methodsGedion
2012-10-01Merge pull request #1006 from cweider/ace-cleanupJohn McLear
Ace cleanup
2012-09-30update docs for new hooks and ace exposuresGedion
2012-09-30Merge pull request #1028 from amtep/developJohn McLear
Fix server crash if client disconnects too soon after connecting
2012-09-30Merge pull request #1020 from marcelklehr/fix/express-v3John McLear
Fixes for express-v3 branch
2012-09-28Prevent server crash in handleClientReadyRichard Braakman
The client might have disconnected between callbacks so don't try to write to the session before checking this. The main callback of this function now has a single check at its top. Removed a redundant check halfway through the callback. Also normalized use of client.id for the session index instead of a mix of client.id and sessionId. Added some explanatory comments.
2012-09-28Add some explanatory comments to handleUserChanges()Richard Braakman
2012-09-28Merge pull request #1025 from amtep/developMarcel Klehr
Fix race condition and a stack error caused by too old changesets
2012-09-27Prettify session handling in handleUserChangesRichard Braakman
Also add a comment to explain what's going on with thisSession. No changes in behavior.
2012-09-26Fix crash when client submits changeset based on too-old revisionRichard Braakman
We had a problem with the server running out of stack space if a client submitted a changeset based on a revision more than about 1000 revs old. (944 was our cutoff but yours may vary). This happened in the wild with about 30 people editing via flaky wifi. A disconnected client would try to submit a fairly old changeset when reconnecting, and a few minutes was enough for 30 people to generate that many revs. The stack kept growing because pad.getRevisionChangeset was being answered from the cache, so no I/O interrupted the callback chain. (This was seen with mysql, I don't know about other backends.) This patch forces a nextTick every 200 revisions to solve this problem.
2012-09-26Fix sessioninfos race that can cause crash during USER_CHANGES handlingRichard Braakman
When stress testing etherpad-lite we occasionally got this error: TypeError: Cannot read property 'author' of undefined at /home/etherpad/etherpad-lite/src/node/handler/PadMessageHandler.js:556:47 handleUserChanges was accessing sessioninfos[client.id].author in a callback, after spending some time in the loop that updates the changeset to the latest revision. It's possible for a disconnect request to be processed during that loop so the session might no longer be there. This patch fixes it by looking up the author at the start of the function.
2012-09-22Merge pull request #1018 from cweider/fix-windowsMarcel Klehr
Upgrade to Yajsml with another Windows backslash fix.
2012-09-22Update docsMarcel Klehr
2012-09-22Fix socket.io auth: Use connect to parse signed cookies (migrate to express v3)Marcel Klehr
2012-09-22Migrate error handling middleware to express v3Marcel Klehr
2012-09-22Set secret on cookieParser (migrate to express v3)Marcel Klehr