~ubuntu-branches/ubuntu/trusty/serf/trusty-updates

« back to all changes in this revision

Viewing changes to buckets/ssl_buckets.c

  • Committer: Bazaar Package Importer
  • Author(s): Peter Samuelson
  • Date: 2010-02-14 23:04:17 UTC
  • mfrom: (1.2.3 upstream)
  • mto: (3.3.1 sid)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: james.westby@ubuntu.com-20100214230417-8zjz7vd5plcoykaz
* New upstream release.
  - patches/libtool: update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
468
468
        serf_bucket_aggregate_append(ctx->decrypt.pending, tmp);
469
469
 
470
470
        ssl_len = SSL_read(ctx->ssl, buf, bufsize);
471
 
        if (ssl_len == -1) {
 
471
        if (ssl_len < 0) {
472
472
            int ssl_err;
473
473
 
474
474
            ssl_err = SSL_get_error(ctx->ssl, ssl_len);
562
562
#ifdef SSL_VERBOSE
563
563
        printf("ssl_encrypt: SSL write: %d\n", ssl_len);
564
564
#endif
565
 
        if (ssl_len == -1) {
 
565
        if (ssl_len < 0) {
566
566
            int ssl_err;
567
567
            serf_bucket_t *tmp;
568
568