Purpose of code changes on this branch:
Add a command line option for the standalone server to make the document 
root configurable.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Log exceptions propagated to SocketServer.
Without this patch, such exceptions are logged to stderr rather than
the log file.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Add Standalone server that runs mod_pywebsocket.
This way, mod_pywebsocket can be used even when Apache HTTP Server is not 
available.

This version doesn't have WSS support yet. (I'm experimenting with pyOpenSSL 
now).

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Asked by ap on e-mail, and by bdash on #webkit.

https://bugs.webkit.org/show_bug.cgi?id=32058

pywebsocket shows following log now:
[2009-12-01 22:43:55,992] [WARNING] root: mod_pywebsocket:
web_socket_transfer_data raised exception: Traceback (most recent call 
last):
  File
"/Volumes/Big/WebKit-BuildSlave/leopard-intel-debug-
tests/build/WebKitTools/pywebsocket/mod_pywebsocket/dispatch.py",
line 179, in transfer_data
    transfer_data_(request)
  File "<string>", line 38, in web_socket_transfer_data
  File
"/Volumes/Big/WebKit-BuildSlave/leopard-intel-debug-
tests/build/WebKitTools/pywebsocket/mod_pywebsocket/msgutil.py",
line 52, in send_message
    request.connection.write('\x00' + message.encode('utf-8') + '\xff')
  File "WebKitTools/pywebsocket/mod_pywebsocket/standalone.py", line 
118, in
write
    return self._request_handler.wfile.write(data)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python
2.5/socket.py",
line 262, in write
    self.flush()
  File
"/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python
2.5/socket.py",
line 249, in flush
    self._sock.sendall(buffer)
  File "<string>", line 1, in sendall
error: (32, 'Broken pipe')

the server should log a more friendly error to indicate what happened 
rather than logging a backtrace.

What steps will reproduce the problem?
1. % python ./mod_pywebsocket/standalone.py -p 8880 -d example
2. open websocket to ws://host/echo?

What is the expected output? What do you see instead?

expected: connection established.

actual: WARNING:root:mod_pywebsocket: No handler for: '/echo?'
 and connection failed.

Please use labels and text to provide additional information.

Purpose of code changes on this branch:
Allow users to specify which subdirecoty to scan for handlers to save time.
This is useful in saving scan time when the handler root directory contains
many non-Web Socket handler files.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Rename test handlers to be more descriptive.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:

To add wss:// support.


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Add --command-line-flag style.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

What steps will reproduce the problem?
1.
2.
3.

What is the expected output? What do you see instead?


Please use labels and text to provide additional information.

Purpose of code changes on this branch:
Make standalone.py log messages to files for easier debugging and monitoring.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Replace invalid characters with U+fffd in decoding UTF-8 string.
The Web Socket protocol section 4.4 specifies that invalid
characters be replaced with U+fffd REPLACEMENT CHARACTER.


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Increase request queue size to accept more simultaneous connections.
This is requested by https://bugs.webkit.org/show_bug.cgi?id=32299.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Implement draft-hixie-thewebsocket-protocol-76 handshake

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

WebSocket protocol/API has been updated at draft-hixie-
thewebsocketprotocol-76

It is incompatible with old spec/current implementation.

Purpose of code changes on this branch:
Add Dispatcher.add_resource_path_alias to make it enable assigning
alias of handler.

This is motivated to have a layout test in webkit to test websocket url
without trailing slash (e.g. ws://127.0.0.1:8880 see
https://bugs.webkit.org/show_bug.cgi?id=33689 ).
We need to have a handler for '/' for the test.


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Make error log messages friendlier.
Log high-level summary as WARNING and log stack trace as INFO.

BUG=28

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

What steps will reproduce the problem?
1. Installing pywebsocket under CentOS 5.4 yields the following error

{{{
Mod_python error: "PythonHeaderParserHandler 
mod_pywebsocket.headerparserhandler"

Traceback (most recent call last):

  File "/usr/lib64/python2.4/site-packages/mod_python/apache.py", line 287, 
in HandlerDispatch
    log=debug)

  File "/usr/lib64/python2.4/site-packages/mod_python/apache.py", line 464, 
in import_module
    module = imp.load_module(mname, f, p, d)

  File "/usr/lib/python2.4/site-
packages/mod_pywebsocket/headerparserhandler.py", line 69, in ?
    _dispatcher = _create_dispatcher()

  File "/usr/lib/python2.4/site-
packages/mod_pywebsocket/headerparserhandler.py", line 55, in 
_create_dispatcher
    _HANDLER_ROOT = apache.main_server.get_options().get(

AttributeError: 'module' object has no attribute 'main_server'
}}}

Was just wondering what version of python the pywebsocket project has 
standardized on and what are the chances of 2.4 support?

Purpose of code changes on this branch:
Implement client hand side draft 76 handshake protocol.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Check script file is a executable file or not.
Only executable file is handled as a CGI script.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
End echo transaction cleanly.
This is to address Issue 21 
http://code.google.com/p/pywebsocket/issues/detail?id=21 .

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Fix style issues in mock.py and test_util.py


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Add wss:// support to the standalone server.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Refactor handshake.py by extracting a default port number function.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Fix the erroneous logic for skipping Web Socket headers.
Also fix some stylistic issues.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:

Add CGI support in standalone.py.
This is necessary to implement some layout tests for cookie handling.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Add server_host option.

Enable to restrict listening interface, e.g. --server_host=127.0.0.1

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
web_socket_shake_hands does not do handshake per se. Rather, it does
additional checking if necessary. Renaming it web_socket_shake_hands_extra
should avoid confusion.


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Add timeout to echo_client.py

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:

Make ws(s) share ports with http(s).
When a request comes in, it is first treated as a Web Socket
request. If Web Socket handshake fails, the request is then
treated as an HTTP request. 

After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Make strict handshake mode stricter as requested by Issue 35.

BUG: 35

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Add an option for stricter handshake checking.

This is related to: https://bugs.webkit.org/show_bug.cgi?id=32249

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Allow \x20 in subprotocol.
The Web Socket Protocol has ben changed to allow \x20 (Space) in the 
subprotocol value.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Add support #!-script on Windows.
Primary goal is to run webkit layout tests on Windows (for now, this hack is 
required to run httponly-cookie.pl as cgi script)

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Cookie headers also being in restricted WebSocket syntax. Like other 
headers, they are case sensitive, require one space after colon, etc.

Purpose of code changes on this branch:
Address issues in msgutil.py, for example, fixing its thread behavior.


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Fix strict mode.

It must accept / as resource name in request.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Make disptach.py handles request with query component.

BUG=25

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

What steps will reproduce the problem?
1. Run echo server as standalone
2. Connect by using echo client
3.

What is the expected output? What do you see instead?
It shouldn't output anything. Instead it outputs:

WARNING:root:mod_pywebsocket: web_socket_transfer_data raised exception: 
Traceback (most recent call last):
  File "/home/alexander/src/pywebsocket-read-
only/src/mod_pywebsocket/dispatch.py", line 178, in transfer_data
    transfer_data_(request)
  File "<string>", line 40, in web_socket_transfer_data
  File "/usr/lib/python2.6/site-packages/mod_pywebsocket/msgutil.py", line 
67, in receive_message
    frame_type = ord(frame_type_str[0])
IndexError: string index out of range

What version of the product are you using? On what operating system?

r101 on Arch Linux, 64-bit.

Please provide any additional information below.

I also got the same result by using an HTML-file as client. If you want 
more details, check out my blog post: http://www.brevityos.org/blog/?p=243

It would be nice if pywebsocket could handle html and cgi in the same 
directory.

What steps will reproduce the problem?
1. print request.connection.remote_ip
2. print request.get_remote_host()

What is the expected output? What do you see instead?
Either 1 or 2 should return me remote ip address.

What version of the product are you using? On what operating system?
On Ubuntu 9.10 -
    1. mod_pywebsocket: web_socket_transfer_data raised exception for 
/register: '_StandaloneConnection' object has no attribute 'remote_ip'

    2. mod_pywebsocket: web_socket_transfer_data raised exception for 
/register: '_StandaloneRequest' object has no attribute 'get_remote_host'


Please provide any additional information below.

pydoc for mod_pywebsocket informs me that -
'''
A Web Socket handler is composed of the following two functions:

        web_socket_do_extra_handshake(request)
        web_socket_transfer_data(request)

    where:
        request: mod_python request.
'''

That request is a mod_python request object, but I am not able to access 1. 
and 2.
I am running in standalone mode. If these properties and methods are not 
available in standalone mode, then what is the other way to access remote 
ip in standalone mode ?

Purpose of code changes on this branch:
Make dispatcher for standalone.py static and shared.
This is to save time for dispatcher creation, which can be long
if there are many files to scan under websock_handlers (scan) directory.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Fix strict handshake header checking. Some rules were too loose.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
Explain how to use the standalone server.

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Purpose of code changes on this branch:
os.path.abspath doesn't normalize as we wanted if there are symbolic links.
For example, in OSX, /tmp is linked to private/tmp and the start up check
in dispatch.py fails.


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Hi, Yoshino-san,

Can you review this?

This is to update pywebsocket to follow the default port number
change.

Yuzo

Purpose of code changes on this branch:
Make the dispatcher find Web Socket handlers even if the root directory
is specified as a relative path. Without this fix, the dispatcher miscalculates
the resource name and overlooks handlers.


When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

Trivial fix, see attached patch

Purpose of code changes on this branch:
Change licensing to BSD-style

When reviewing my code changes, please focus on:


After the review, I'll merge this branch into:
/trunk

pywebsocket uses mod_python only.
is mod_wsgi support planned to be added?