Commit Graph

1194 Commits (f386f7d48470a442e7ce7a89fc8cb4ca7daea5af)

Author SHA1 Message Date
Ariya Hidayat feafb4f5a3 Add the CoffeeScript version of simpleserver.
This is for the new simpleserver example introduced in commit 9eae7f1.

http://code.google.com/p/phantomjs/issues/detail?id=115
2011-12-19 17:55:27 -08:00
Ariya Hidayat 446abdbd7e Fix wrong exit code (regression).
http://code.google.com/p/phantomjs/issues/detail?id=294
2011-12-19 17:53:39 -08:00
Ariya Hidayat 471e12a375 JSLint fix: Combine all variable declarations. 2011-12-19 17:52:53 -08:00
Ariya Hidayat d5bc2b8192 Update CoffeeScript compiler to version 1.2.
http://code.google.com/p/phantomjs/issues/detail?id=312
2011-12-19 17:51:45 -08:00
Ariya Hidayat 9eae7f101b Add a simpler example for the WebServer module.
This does nothing but to start an HTTP server on the given port.
The request is merely dumped back as the formatted response.

This example is useful for simple troubleshooting.

http://code.google.com/p/phantomjs/issues/detail?id=115
2011-12-19 08:28:06 -08:00
Ariya Hidayat 32203d9a97 Remove tabs in the ChangeLog. 2011-12-19 08:22:06 -08:00
Ariya Hidayat 2823674ec2 Merge branch 'master' of github.com:ariya/phantomjs 2011-12-19 08:15:21 -08:00
Ariya Hidayat 6983f6bdf1 Update Sencha folks. 2011-12-19 01:14:31 -08:00
IceArmy 93c542d5f9 Revert some of commit 8ade9f43 2011-12-15 17:06:56 -08:00
IceArmy 3581fae3c0 Revert most of commit c8f45c2d 2011-12-15 17:04:23 -08:00
IceArmy c8f45c2d15 Replace more unused variables with _ 2011-12-13 13:09:34 -08:00
Ariya Hidayat 6f096e1ed7 Merge pull request #184 from wangyang0123/fix-url-for-onResourceRequested
fixed TypeError when call e.url in page.onResourceRequested handler
2011-12-13 08:49:32 -08:00
Danny Wang 15ac9ab291 fixed TypeError when call e.url in page.onResourceRequested handler
http://code.google.com/p/phantomjs/issues/detail?id=305
2011-12-13 16:39:09 +08:00
IceArmy a300deabe8 Use object identity tests where needed 2011-12-11 22:59:50 -08:00
IceArmy 8ade9f43a4 Fixed some small obscure bugs, clean up the code, and renamed unused variables to _ 2011-12-11 21:37:33 -08:00
Paul Tsier b10dc130ce Call qRegisterMetaType on mongoose types 2011-12-11 18:54:35 -08:00
Ariya Hidayat 3c0957834c used QUrl::fromEncoded() and QUrl::toEncoded() instead of QUrl(string) and QUrl::toString() when converting urls
Patch by Danny Wang: https://github.com/ariya/phantomjs/pull/183

http://code.google.com/p/phantomjs/issues/detail?id=301
2011-12-11 14:32:00 -08:00
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
Ariya Hidayat 84a339b10a Merge pull request #180 from Roejames12/master
Updates
2011-12-11 12:57:49 -08:00
Ariya Hidayat ddd7774f87 Merge pull request #179 from v1o/master
Passed test results failed count as exit code
2011-12-11 12:53:32 -08:00
Ariya Hidayat b460ad3f57 Merge pull request #182 from jonleighton/fix_qurl_segfault
Workaround Qt 4.8 segfault

http://code.google.com/p/phantomjs/issues/detail?id=304
2011-12-11 12:52:15 -08:00
IceArmy e88b0ec5e9 Move setup script to better location 2011-12-11 09:39:54 -08:00
Jon Leighton 38269c7b35 Workaround Qt 4.8 segfault 2011-12-06 20:25:52 +00: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
Viorel Dram 2ffcd1375f Passed test results failed count as exit code 2011-11-29 11:39:09 +02: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
Ariya Hidayat ac95479424 Merge pull request #166 from jgornick/add-socks5-proxy
Added ability to specify SOCKS5 proxy type.

http://code.google.com/p/phantomjs/issues/detail?id=266
2011-11-21 20:47:56 -08:00
Ariya Hidayat 6c0f723aa9 Merge pull request #175 from jonleighton/fix_mongoose
Explicitly link to libdl

http://code.google.com/p/phantomjs/issues/detail?id=115
2011-11-21 10:16:43 -08:00
Jon Leighton 717c4af108 Explicitly link to libdl 2011-11-21 18:12:23 +00:00
Ariya Hidayat 61f4434247 Merge pull request #174 from KDAB/inspector-for-upstream
http://code.google.com/p/phantomjs/issues/detail?id=6
2011-11-16 20:43:59 -08:00
Ariya Hidayat f77046ea16 Merge pull request #173 from KDAB/git-build
Add Qt 4.8 support to deploy script, along with some patches to Qt.

http://code.google.com/p/phantomjs/issues/detail?id=197
http://code.google.com/p/phantomjs/issues/detail?id=6
http://code.google.com/p/phantomjs/issues/detail?id=163
2011-11-16 20:40:32 -08:00
Leo Franchi d5b2d110fb Add patches 2011-11-15 22:29:59 -05:00
Leo Franchi f22877d625 Add Qt 4.8 support to deploy script, along with some patches to qt 2011-11-15 19:36:14 -05:00
Leo Franchi fbdbcd7f69 Minor fixes 2011-11-15 19:11:42 -05:00
Leo Franchi 610fb41922 Add support for remotely debugging a script.
This adds a new parameter --remote-debugger-port=<port>. When set,
phantomjs is operating in debug mode and will expose a webkit remote
debugger on the desired port. It can be attached to from any WebKit
browser on the given port and debugged.
2011-11-15 19:02:06 -05:00
Ariya Hidayat fa4391d514 Merge pull request #172 from KDAB/webserver-cleaned
This is the basic web server functionality.

http://code.google.com/p/phantomjs/issues/detail?id=115
2011-11-15 08:11:24 -08:00