Commit Graph

320 Commits

Author SHA1 Message Date
Ariya Hidayat d9d2ce73e9 Add arguments to pyphantomjs.main().
Patch by Christophe Benz.
Manually applied from https://github.com/ariya/phantomjs/pull/178.
2011-12-11 13:07:06 -08:00
IceArmy e88b0ec5e9 Move setup script to better location 2011-12-11 09:39:54 -08:00
IceArmy 930f6f1bcc Fix bug where port number wasn't 0 if listen failed. 2011-12-05 09:29:56 -08:00
IceArmy 7567752d2b Don't send body or content-length header under certain conditions
We have to include this check for the content-length header (since it's auto generated), however, the script is supposed to take care of not sending any message body; but we've taken care of that anyways, to conform a little more to standards.
2011-12-04 22:44:39 -08:00
IceArmy 18e9575f9d Update comments for patched function 2011-12-04 22:01:54 -08:00
IceArmy 5c176eb32a Fix bug where when using sendError, headers were sent again, causing headers to show in the body
Also did a much nicer job of cleaning up the code
2011-12-04 19:18:54 -08:00
IceArmy d9bb34b257 Oops! That should be a str, not int. 2011-12-04 17:56:14 -08:00
IceArmy 2cc3f636bc WebServer can send error pages with a simple call 2011-12-04 15:25:01 -08:00
IceArmy 02fe5f6018 Add hooks to webserver.py 2011-12-04 09:41:54 -08:00
IceArmy 235611ec2f Do a little cleanup
Improved CaseInsensitiveDict a little.
Added some more messages for the method patch.
Added a break in a for loop
2011-12-03 23:04:08 -08:00
IceArmy c12030cd66 Clear self.m_servers at script exit 2011-12-03 17:16:10 -08:00
IceArmy f1f2d275c5 Regenerate resources 2011-12-02 16:03:52 -08:00
IceArmy b3a589aaa7 This is the basic web server functionality.
http://code.google.com/p/phantomjs/issues/detail?id=115
2011-12-02 16:02:52 -08:00
IceArmy f94b87551d Probably best to take the base of the UnicodeError exceptions... 2011-11-30 11:35:44 -08:00
IceArmy 60b8d6b347 Fix bug where unicode characters in script arguments weren't correctly passed along. 2011-11-30 11:23:40 -08:00
IceArmy 424214361a Further refactoring
Modified utils a bit to remove the problem of future circular imports
Cleaned up main pyphantomjs file
Cleaned up a little of the code
2011-11-27 10:56:12 -08:00
IceArmy 4ec8df3a84 Refactor arguments system
Arguments stuff now contained in its own file
Use a defaults dict to change default in only one place
2011-11-26 17:13:13 -08:00
IceArmy 4dc051a60e Added ability to specify SOCKS5 proxy type.
http://code.google.com/p/phantomjs/issues/detail?id=266
2011-11-25 11:27:03 -08:00
Milian Wolff 73705e484b first work towards a WebServer
this is the minimal server that gets properly embedded into
the phantomjs space but the .listen api is missing actually
useful options (incoming request and ability to write to client)
2011-11-15 13:44:47 +01:00
Ariya Hidayat f1b03e84d9 Bump the unstable version to 1.4. 2011-10-29 11:18:50 -05:00
IceArmy be8eece175 Refactor hook creation and hook existence checks in plugincontroller 2011-10-28 01:03:44 -07:00
IceArmy 5bcd3897a3 Refactored some redundant code from load_plugins() 2011-10-28 00:26:22 -07:00
IceArmy ec55ebdc00 Merge branch 'master' of git://github.com/ariya/phantomjs 2011-10-26 11:48:04 -07:00
Ariya Hidayat f18fd5372f Fix regression of onInitialized.
As suggested by Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>,
there is no need to use queued connection for initialized() slot.

http://code.google.com/p/phantomjs/issues/detail?id=264
2011-10-25 09:48:27 -05:00
IceArmy ee9646c5e7 Revert "cookie.value() didn't really need to be a string, since QSettings will take a QVariant anyways."
This reverts commit 5ffeef450c.

Apparently, this actually does cause a problem, as further cookies are saved in the cookies.txt file, and if the value isn't a string, then we get QByteArray() stuff polluted everywhere in the file. Oops!
2011-10-18 18:52:47 -07:00