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
Milian Wolff
46a5ccf1e5
extend webserver test
2011-11-15 13:45:17 +01:00
Milian Wolff
bd2052631f
basic unit testing for WebServer.listen
2011-11-15 13:45:11 +01:00
Milian Wolff
5eaf705955
basic unit test for webserver
2011-11-15 13:45:11 +01:00
Milian Wolff
667c585424
don't deadlock, could happen on error
...
i.e. if we tried to listen to an already used port, the error
was propagated in the main thread and the blockingqueuedconnection
would deadlock. not anymore
2011-11-15 13:45:11 +01:00
Milian Wolff
36e8a3e87c
cleanup api
2011-11-15 13:45:11 +01:00
Milian Wolff
e5a35d6416
some API dox
2011-11-15 13:45:11 +01:00
Milian Wolff
6376ff0cb9
--debug
2011-11-15 13:45:11 +01:00
Milian Wolff
a6bde751a9
extend WebServerResponse API
2011-11-15 13:45:11 +01:00
Milian Wolff
705eda8823
add read-properties to WebServerRequest
2011-11-15 13:45:11 +01:00
Milian Wolff
245eec551f
make it possible to access the request headers
2011-11-15 13:45:11 +01:00
Milian Wolff
f30bfa9fb7
extend WebServerRequest API
2011-11-15 13:45:11 +01:00
Milian Wolff
0abdc7f9ed
very basic response + request handling for WebServer
...
the api is very limited but already makes the server.js example
do something useful with the server
2011-11-15 13:45:11 +01: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
Milian Wolff
c3179c3dee
move mongoose dir, use same setup like in gif folder
2011-11-15 13:38:01 +01:00
Aditya Ivaturi
feed6fdc72
From now on including mongoose directly in the project
2011-11-15 13:38:01 +01:00
Aditya Ivaturi
2e43d7da15
Modified name of the shared lib generated
2011-11-15 13:38:01 +01:00
unknown
2b21135119
Fixed the make command for mingw
2011-11-15 13:38:01 +01:00
Aditya Ivaturi
71ffff002f
Adding mongoose code & commented out parts in Makefile to skip the exe generation
2011-11-15 13:38:01 +01:00
Joe Gornick
cd9f40b22d
Merge branch 'master' of git://github.com/ariya/phantomjs into add-socks5-proxy
2011-11-08 23:23:28 -06:00
Joe Gornick
d91c5af9b2
Added ability to specify SOCKS5 proxy type.
2011-11-08 21:58:48 -06:00
Ariya Hidayat
d8494a3f37
Merge pull request #170 from Roejames12/bfd54c381716fb841bd59372d52c390678c62b2e
...
Add bugfix to changelog
2011-11-06 05:40:09 -08:00
IceArmy
bfd54c3817
Add a bug fix to the changelog
2011-11-05 21:10:46 -07:00
Ariya Hidayat
04e281e365
Static Linux build script: disable some more configs.
...
http://code.google.com/p/phantomjs/issues/detail?id=197
2011-11-04 19:54:24 -07:00
Ariya Hidayat
ada7611cda
Initial version of build script for static Linux.
...
http://code.google.com/p/phantomjs/issues/detail?id=197
2011-11-04 08:39:01 -07:00
Ariya Hidayat
f1b03e84d9
Bump the unstable version to 1.4.
2011-10-29 11:18:50 -05:00
Ariya Hidayat
708c8e4719
Merge pull request #169 from Roejames12/master
...
Small updates
2011-10-29 08:36:36 -07: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
8ffd7a2403
detectsniff example: Check if the web page sniffs the user agent.
...
http://code.google.com/p/phantomjs/issues/detail?id=263
2011-10-25 11:33:10 -05: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
3980f76533
Merge branch 'master' of git://github.com/ariya/phantomjs
2011-10-20 20:51:23 -07: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
Ariya Hidayat
b032d59297
Merge pull request #168 from Roejames12/master
...
Small updates
2011-10-18 00:23:56 -07:00
IceArmy
5ffeef450c
cookie.value() didn't really need to be a string, since QSettings will take a QVariant anyways.
2011-10-17 23:32:55 -07:00
IceArmy
3ea50c443f
Minimize down the with statements that use QPyFile
2011-10-17 22:44:19 -07:00
IceArmy
005e54de56
Merge branch 'master' of git://github.com/ariya/phantomjs
2011-10-17 21:01:45 -07:00
IceArmy
34b595d01d
Remove unused javascript files
2011-10-17 21:01:17 -07:00
Ariya Hidayat
d4abd3b71b
Merge pull request #167 from detro/master
...
Refactored and Centralised how we handle the loading of resource files.
2011-10-17 20:49:24 -07:00
Ivan De Marino
19b32cff0a
Refactored and Centralised how we handle the loading of resource files.
...
* Some code reuse
* Centralised in Utils the loading of resource files
* It is safe to assume, when loading a resource file, that IT'S THERE and IT'S READABLE
* ALSO, I removed the unused 'shims' (we forgot them in there :P)
2011-10-16 20:35:21 +01:00
Ariya Hidayat
3c11109e28
Merge pull request #164 from nixterrimus/patch-1
...
Change comment in run-jasmine example to be consistent with the way the c
2011-10-06 19:40:30 -07:00
Nick Rowe
56f470e3a1
Change comment in run-jasmine example to be consistent with the way the code is written
2011-10-06 13:43:12 -07:00
IceArmy
13118b35bf
Avoid deleting a QWebPage inside its own signal emission.
...
If Phantom.exit() is called inside the handler for loadFinished(), we
end up in a situation that QWebPage is deleting itself during a signal
emission. This used to be OK in QtWebKit 2.0 (Qt 4.7) but is not OK for
QtWebKit 2.2 (upcoming Qt 4.8).
http://code.google.com/p/phantomjs/issues/detail?id=251
Patch by Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>.
2011-10-06 08:28:23 -07:00