aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Updated for SDK buildsstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.1cm-12.0cretin452014-11-211-1/+1
* Merge branch 'koush' into cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56staging/cm-12.0-cafstable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0cretin452014-10-012-3/+3
|\
| * Merge pull request #248 from IkhlasStudio/fix-charsetKoushik Dutta2014-09-282-3/+3
| |\
| | * fix charset from utf8 to utf-8Amin Cheloh2014-09-252-3/+3
| |/
| * Merge pull request #247 from robUx4/invalid_uri_debugKoushik Dutta2014-09-221-1/+3
| |\
| | * more debug about invalid URI not recognized by any middlewareSteve Lhomme2014-09-191-1/+3
| * | fix https://github.com/koush/AndroidAsync/issues/244Koushik Dutta2014-09-171-2/+12
| |/
| * Merge pull request #242 from ey3ball/masterKoushik Dutta2014-09-133-8/+5
| |\
| | * expose initial http request to WebSocket handlersFlorian Vallee2014-09-123-4/+5
| | * Revert "Added protected API for WebSocket creation"Florian Vallee2014-09-121-5/+1
| |/
| * AsyncServer: *actually* use the resolved address.Koushik Dutta2014-09-101-1/+1
| * AsyncServer: Catch all selector exceptions.Koushik Dutta2014-09-101-10/+6
* | more debug about invalid URI not recognized by any middlewareSteve Lhomme2014-09-261-1/+3
* | fix https://github.com/koush/AndroidAsync/issues/244Koushik Dutta2014-09-261-2/+12
* | expose initial http request to WebSocket handlersFlorian Vallee2014-09-263-4/+5
* | Revert "Added protected API for WebSocket creation"Florian Vallee2014-09-261-5/+1
* | AsyncServer: *actually* use the resolved address.Koushik Dutta2014-09-261-1/+1
* | AsyncServer: Catch all selector exceptions.Koushik Dutta2014-09-261-10/+6
* | Merge upstream into cm-11.0cretin452014-09-0991-610/+959
|\|
| * watch for selector exceptions.Koushik Dutta2014-09-091-0/+4
| * Merge pull request #238 from paulpdaniels/patch-2Koushik Dutta2014-09-081-1/+5
| |\
| | * Added protected API for WebSocket creationpaulpdaniels2014-09-081-1/+5
| |/
| * imlKoushik Dutta2014-09-071-0/+3
| * Merge pull request #230 from TheFinestArtist/patch-1Koushik Dutta2014-08-311-1/+1
| |\
| | * Update README.mdTae Hwan Kim2014-09-011-1/+1
| |/
| * fix cherry-pickKoushik Dutta2014-08-261-1/+0
| * 138Koushik Dutta2014-08-261-2/+2
| * Fix up leaky alloctions.Koushik Dutta2014-08-265-11/+13
| * imlKoushik Dutta2014-08-161-1/+19
| * DataEmitter.charset fixes:Koushik Dutta2014-08-162-2/+10
| * Merge pull request #221 from zbsz/pingKoushik Dutta2014-08-093-6/+36
| |\
| | * Add api for sending ping and receiving pong on WebSocketZbigniew Szymański2014-08-083-6/+36
| * | fix gzip input filterKoushik Dutta2014-08-071-0/+9
| * | watch for exceptions when setting the proxyKoushik Dutta2014-08-071-1/+8
| |/
| * Some HTTP servers are sending only newline instead of CRLF.Koushik Dutta2014-08-031-1/+4
| * Merge pull request #215 from robUx4/missing_md5_workaroundKoushik Dutta2014-07-291-8/+35
| |\
| | * use another hash function if MD5 is not availableSteve Lhomme2014-07-281-8/+35
| * | Merge pull request #216 from robUx4/npe_android2xKoushik Dutta2014-07-291-0/+3
| |\ \ | | |/ | |/|
| | * Fix a rare NPE crash in Android 2.xSteve Lhomme2014-07-281-0/+3
| |/
| * potential fix for selector exception in L preview.Koushik Dutta2014-07-241-1/+6
| * Merge pull request #209 from robUx4/endcallback_npe_fixKoushik Dutta2014-07-221-1/+1
| |\
| | * Crash fix for a case where the EndCallback is not set and usedSteve Lhomme2014-07-221-1/+1
| |/
| * Merge pull request #206 from stuckless/masterKoushik Dutta2014-07-182-4/+4
| |\
| | * removed package protected on some fields so that subclasses could access the ...Sean Stuckless2014-07-182-4/+4
| |/
| * fixes for eclipseKoushik Dutta2014-07-184-22/+12
| * derp.Koushik Dutta2014-07-173-3/+21
| * ByteBuffer List fixes:Koushik Dutta2014-07-1612-78/+134
| * AsyncSSLSocketWrapper: Perform handshake before allowing read/write.Koushik Dutta2014-07-133-158/+85
| * Refactor proxy implementation. Maybe this should go into ion?Koushik Dutta2014-07-134-78/+64
| * Merge branch 'use_android_proxy' of git://github.com/robUx4/AndroidAsync into...Koushik Dutta2014-07-122-0/+48
| |\