diff options
| author | Björn Gustavsson <[email protected]> | 2010-09-10 10:44:15 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-09-10 10:44:15 +0200 |
| commit | c2d085e76f38467ea530b294edd3767ade88332c (patch) | |
| tree | 0662a27795b1a1bd9bb50f9a25d2d14432fc26c1 /erts/emulator | |
| parent | d90480306e4fcd3abc9717034a38868f639d45b1 (diff) | |
| parent | 33caf70b63ef4cdb7ba5f3b24d7f04c596f081eb (diff) | |
| download | otp-c2d085e76f38467ea530b294edd3767ade88332c.tar.gz otp-c2d085e76f38467ea530b294edd3767ade88332c.tar.bz2 otp-c2d085e76f38467ea530b294edd3767ade88332c.zip | |
Merge branch 'bjorn/http-packet-error/OTP-8831' into dev
* bjorn/http-packet-error/OTP-8831:
Make gen_tcp:recv/2 consistent with ssl:recv/2
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 3f761eeb19..3de48194fb 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -2174,7 +2174,7 @@ static int http_error_inetdrv(void* arg, const char* buf, int len) ErlDrvTermData spec[19]; if (desc->inet.active == INET_PASSIVE) { - /* {inet_async,S,Ref,{error,{http_error,Line}}} */ + /* {inet_async,S,Ref,{ok,{http_error,Line}}} */ int req; int aid; ErlDrvTermData caller; @@ -2184,7 +2184,7 @@ static int http_error_inetdrv(void* arg, const char* buf, int len) i = LOAD_ATOM(spec, i, am_inet_async); i = LOAD_PORT(spec, i, desc->inet.dport); i = LOAD_INT(spec, i, aid); - i = LOAD_ATOM(spec, i, am_error); + i = LOAD_ATOM(spec, i, am_ok); i = LOAD_ATOM(spec, i, am_http_error); i = http_load_string(desc, spec, i, buf, len); i = LOAD_TUPLE(spec, i, 2); |