Wynne Crisman
|
7034a00093
|
Revert "Modified build script to use jdk 1.7 instead of 1.5 for building the release compile; Added debug output to try to identify the error where interestOps isn't set properly for a socket that isn't yet closed; Fixed index exception in identifying the host."
This reverts commit 5d9ea7528b.
|
2016-02-22 10:30:17 -08:00 |
|
Wynne Crisman
|
5d9ea7528b
|
Modified build script to use jdk 1.7 instead of 1.5 for building the release compile; Added debug output to try to identify the error where interestOps isn't set properly for a socket that isn't yet closed; Fixed index exception in identifying the host.
|
2016-02-22 10:27:22 -08:00 |
|
wcrisman
|
439eca5e9d
|
Fixed bug in host detection for non-SSL HTTP sockets.
|
2014-12-29 13:22:07 -08:00 |
|
wcrisman
|
eb4a935562
|
Changed key.channel().close() into just calling close on the SocketContext throughout the code. Comment changes and debugging additions and changes.
|
2014-12-29 11:57:32 -08:00 |
|
wcrisman
|
f9be168cc8
|
Changed SocketContext.writeClientBoundPlainMessage() to be more like the master branch. Removed commented code.
|
2014-12-29 11:08:28 -08:00 |
|
wcrisman
|
c0a4621a4c
|
Enabled the queuing of messages in a linked list again (from the writeOutgoingMessages() method. Removed commented code and comments.
|
2014-12-29 10:57:06 -08:00 |
|
wcrisman
|
b6d57986f2
|
Reorganized SocketContext code so that methods are in the correct order to compare with the master branch. Added code back in and updated code as necessary to be as identical as possible to the master branch for the Websocket related methods and classes. Updated PassThroughSocketContext to be as identical as possible to the master branch. Updated NetworkListener to be as identical as possible to the master branch. Commented a number of TODO's in SocketContext for turning on bits of code that might cause problems, but will bring this branch up to speed with the master branch.
|
2014-12-29 10:35:10 -08:00 |
|
wcrisman
|
5aece2300e
|
Finished fixing the bug in the last two commits where by the content filling the buffer was causing major problems with the resulting client display (not sure why and don't care).
|
2014-12-29 09:24:51 -08:00 |
|
wcrisman
|
b3648439e6
|
Fixed bug where initialization wasn't affecting the isClosed status of a message (not initialized meant that the buffer was null which indicated the message was closed before it had ever started being sent). Moved isInitialized into the MessageBuffer base class.
|
2014-12-29 09:18:59 -08:00 |
|
wcrisman
|
28e0787f94
|
Fixed compilation bug.
|
2014-12-28 23:08:21 -08:00 |
|
wcrisman
|
ce99adb839
|
Added HttpMessageBuffer and modified MessageBuffer to be identical to the code in the master branch. Modified SocketContext.queueOutboundClientMessage() to be identical to the master branch. Changed SocketContext.sendHttpResponse() to call the queueOutboundClientMessage() passing a new HttpMessageBuffer. Fixed errors as necessary to make it all compile.
|
2014-12-28 22:03:40 -08:00 |
|
wcrisman
|
6cbd188867
|
Modified prepareResponse() to call queueOutboundClientMessage instead of directly setting the currentOutboundMessage.
|
2014-12-28 21:13:24 -08:00 |
|
wcrisman
|
c7188095d0
|
Copied SocketContext.readIncommingMessages() from the master tree and updated as required to fix errors.
|
2014-12-28 20:55:16 -08:00 |
|
wcrisman
|
840fa8dd89
|
Changed the SocketContext.writeOutgoingMessages() to copy the code in the master tree. Changed the SSL reading code to call the new writeClientBoundMessage() with the proper parameters. Removed internalProcessResponses().
|
2014-12-28 20:33:03 -08:00 |
|
wcrisman
|
bd3e9ac5cc
|
Changed code in SocketContext.writeClientBoundSslMessage() to sync it up with the master branch (they are now identical (or nearly).
|
2014-12-28 17:45:22 -08:00 |
|
wcrisman
|
eb3574bb3f
|
Made AbstractSocketContext.id private and added an accessor to help merge code between branches. Modified WebServer.debug to be private with a public accessor to make code mergable between branches. Fixed code in NetworkListener and SocketContext to use accessors instead of attributes for id and debug. Modified SocketContext.writeClientBoundSslMessage() to take the channel and currentOutboundMessage as parameters to make code more mergable, and added debug output from main branch. Removed calls in the SSL code to chain buffers in a MessageBuffer, which should not be used currently anyway, and won't be used in the future.
|
2014-12-28 17:15:57 -08:00 |
|
wcrisman
|
d1d5671229
|
Fixed bug in the internalProcessResponses() in SocketContext where a message was flagged as needing to send more data because of already encrypted but unsent data, but was not properly sending the data because the currentOutboundMessage was closed and cleared.
|
2014-12-28 17:09:06 -08:00 |
|
wcrisman
|
0c3b7d026b
|
Fixed bug in MessageBuffer to close the buffer instead of just setting buffer = null. Modified MessageBuffer to close the response if closed its self. Modified SocketContext to get rid of the response linked list, and close the outbound message instead of the response (no more references to Response). Modified SocketContext to immediately create a MessageBuffer from a Response that is ready to be sent, and set it as the currentOutboundMessage (no list or linked list used currently). Modified writeSessionCookies() and prepareResponse() in SocketContext to take the Response as a parameter.
|
2014-12-28 16:03:49 -08:00 |
|
wcrisman
|
a9a0e799e2
|
Short circuited the response linked list since it shouldn't be being used.
|
2014-12-28 14:52:24 -08:00 |
|
wcrisman
|
7a75ba30de
|
Split sending message code into SSL and plain.
|
2014-12-28 14:48:03 -08:00 |
|
wcrisman
|
7f4d6702a0
|
Revert "Modified SocketContext to use a queue and an active reference to the outbound messages instead of multiple linked lists."
This reverts commit 06cbff7cf0.
|
2014-12-28 14:38:27 -08:00 |
|
wcrisman
|
06cbff7cf0
|
Modified SocketContext to use a queue and an active reference to the outbound messages instead of multiple linked lists.
|
2014-12-28 10:43:25 -08:00 |
|
wcrisman
|
3e1a531fc3
|
Separated inner classes from WebServer.
|
2014-12-28 09:32:25 -08:00 |
|
wcrisman
|
ba35deff06
|
Revert "Switched to using HttpMessageBuffer in the code and moved the code from prepareResponse into initialize."
This reverts commit c36467d172.
|
2014-12-26 10:17:33 -08:00 |
|
wcrisman
|
6c9931d4f9
|
Revert "Simplified writeOutgoingMessages() and removed the call to internalProcessResponses(). Likely bugs in writeClientBoundMessage()."
This reverts commit 29ade9b7b0.
|
2014-12-26 10:17:15 -08:00 |
|
wcrisman
|
72fa63028e
|
Revert "Fixed bugs in writeClientBoundMessage."
This reverts commit a30fcb4002.
|
2014-12-26 10:16:49 -08:00 |
|
wcrisman
|
7152465730
|
Revert "Updated/Fixed queueOutboundClientMessage(..), sendHttpResponse(..), and hasPendingWrite()."
This reverts commit 48724e445c.
|
2014-12-26 09:28:37 -08:00 |
|
wcrisman
|
48724e445c
|
Updated/Fixed queueOutboundClientMessage(..), sendHttpResponse(..), and hasPendingWrite().
|
2014-12-10 17:51:41 -08:00 |
|
wcrisman
|
a30fcb4002
|
Fixed bugs in writeClientBoundMessage.
|
2014-12-10 17:07:47 -08:00 |
|
wcrisman
|
29ade9b7b0
|
Simplified writeOutgoingMessages() and removed the call to internalProcessResponses(). Likely bugs in writeClientBoundMessage().
|
2014-12-10 16:31:22 -08:00 |
|
wcrisman
|
c36467d172
|
Switched to using HttpMessageBuffer in the code and moved the code from prepareResponse into initialize.
|
2014-12-10 14:37:55 -08:00 |
|
wcrisman
|
d00638873b
|
Applied some of the changes to the structure of WebServer that were least controversial. Some of the code added is not yet used.
|
2014-12-08 17:23:59 -08:00 |
|
wcrisman
|
acbae41318
|
Reversed that last change which did cause a bug (but not the bug unfortunately), and implemented the last change which might cause issues.
|
2014-12-07 21:40:13 -08:00 |
|
wcrisman
|
6bd73c6875
|
Removed commented old code. Made one more minor change that might break things.
|
2014-12-07 21:24:32 -08:00 |
|
wcrisman
|
b6b8de62fb
|
Commented out all the flagging code, leaving two possible bits of code that could cause an error.
|
2014-12-07 21:19:05 -08:00 |
|
wcrisman
|
866e8d8bbd
|
Switched the WebServer to detecting which flags to apply to a socket based on whether there is a pending write or remaining byte in the encrypted write buffer (likely a cause of the bug).
|
2014-12-07 20:33:18 -08:00 |
|
wcrisman
|
d0360ad252
|
Merged as many changes as possible in WebServer from the master branch without including any that would likely cause problems.
|
2014-12-07 20:19:51 -08:00 |
|
wcrisman
|
3d08ad5810
|
Added a few more changes into the mix. Only changes left are in WebServer.
|
2014-12-07 18:38:04 -08:00 |
|
wcrisman
|
ae1de97e91
|
Fixed compile errors by transferring more of the changes to this new branch. Previous upload doesn't compile.
|
2014-12-07 18:34:03 -08:00 |
|
wcrisman
|
2adcfad863
|
Merged many of the changes from the first attempt at an HTML5 Websocket implementation. Focused on the ones that didn't change the behavior of the web server.
|
2014-12-07 16:12:29 -08:00 |
|
wcrisman
|
46df41d433
|
Added debug output showing the message header for a HTTP message that failed to be read.
|
2014-09-17 09:49:04 -07:00 |
|
wcrisman
|
b48e81bfe0
|
Added exception handling in the main loop for the web server to avoid the main loop thread getting killed off due to an unexpected/unhandled exception.
Moved code for JSON handling and metadata/metadata container into the Common project from the Foundation project.
|
2014-09-16 14:01:31 -07:00 |
|
wcrisman
|
1a8fd62dd8
|
Modified the web server to use a dedicated thread to handle socket management. It now will setup new sockets, and pass request and response handling for each socket needing it to a runnable run through the thread service. This may impact performance (not sure which direction) and will ensure that socket listening is never dropped in favor of message processing.
|
2014-08-30 17:28:58 -07:00 |
|
wcrisman
|
fa572dae03
|
Modified ThreadService & Scheduler to allow the web server to pass a delegate service such that all webapps will use one service for each function (reduction in threading and debug complexity).
|
2014-08-30 15:43:30 -07:00 |
|
wcrisman
|
fba1f9f9b3
|
Re-added the clearing of SocketContext's request reference since it was causing problems with future requests.
|
2014-07-30 23:39:57 -07:00 |
|
wcrisman
|
12d99f8b4d
|
Removed dead code.
Change to WebServer's listener code to ensure that there is always a thread listening (we somehow ended up with no thread listening in some cases).
|
2014-07-30 23:21:05 -07:00 |
|
wcrisman
|
cd0976ea2e
|
Ensured the NPE should never again happen by accessing the request from the response instead of from the socket context.
|
2014-07-27 22:13:01 -07:00 |
|
wcrisman
|
164841677b
|
Fixed NPE due to request being cleared before it should be since we now don't send the response immediately back on the socket, but rather on another socket listener thread.
|
2014-07-27 22:10:16 -07:00 |
|
wcrisman
|
0b5e458dff
|
Removed double lock requirement for pass through sockets.
|
2014-07-27 22:04:42 -07:00 |
|
wcrisman
|
b0ae8b7e72
|
Merge branch 'master' of http://192.168.2.29:8990/r/Brainstorm
|
2014-07-18 17:21:36 -07:00 |
|