casa-mp-base
Public
Commits
Anders F. Björklund authored 4c30010161e
| 1 + | # http://bugs.gentoo.org/show_bug.cgi?id=214799 : |
| 2 + | # http://bugs.gentoo.org/attachment.cgi?id=152271 |
| 3 + | diff -Naur tmp-old/rpmio/rpmdav.c tmp-new/rpmio/rpmdav.c |
| 4 + | --- rpmio/rpmdav.c 2008-03-28 04:40:52.000000000 +0000 |
| 5 + | +++ rpmio/rpmdav.c 2008-03-28 05:19:50.000000000 +0000 |
| 6 + | |
| 7 + | } |
| 8 + | |
| 9 + | static void davNotify(void * userdata, |
| 10 + | - ne_conn_status connstatus, const char * info) |
| 11 + | + ne_session_status sessionstatus, const char * info) |
| 12 + | /*@*/ |
| 13 + | { |
| 14 + | urlinfo u = userdata; |
| 15 + | |
| 16 + | |
| 17 + | #ifdef REFERENCE |
| 18 + | typedef enum { |
| 19 + | - ne_conn_namelookup, /* lookup up hostname (info = hostname) */ |
| 20 + | - ne_conn_connecting, /* connecting to host (info = hostname) */ |
| 21 + | - ne_conn_connected, /* connected to host (info = hostname) */ |
| 22 + | - ne_conn_secure /* connection now secure (info = crypto level) */ |
| 23 + | -} ne_conn_status; |
| 24 + | + ne_status_lookup = 0, /* looking up hostname */ |
| 25 + | + ne_status_connecting, /* connecting to host */ |
| 26 + | + ne_status_connected, /* connected to host */ |
| 27 + | + ne_status_sending, /* sending a request body */ |
| 28 + | + ne_status_recving, /* receiving a response body */ |
| 29 + | + ne_status_disconnected /* disconnected from host */ |
| 30 + | +} ne_session_status; |
| 31 + | #endif |
| 32 + | |
| 33 + | - u->connstatus = connstatus; |
| 34 + | + u->sessionstatus = sessionstatus; |
| 35 + | |
| 36 + | /*@-boundsread@*/ |
| 37 + | if (_dav_debug < 0) |
| 38 + | -fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, connstatus, info, sess, u, connstates[ (connstatus < 4 ? connstatus : 4)]); |
| 39 + | +fprintf(stderr, "*** davNotify(%p,%d,%p) sess %p u %p %s\n", userdata, sessionstatus, info, sess, u, connstates[ (sessionstatus < 5 ? sessionstatus : 5)]); |
| 40 + | /*@=boundsread@*/ |
| 41 + | |
| 42 + | } |
| 43 + | |
| 44 + | #endif |
| 45 + | |
| 46 + | ne_set_progress(u->sess, davProgress, u); |
| 47 + | - ne_set_status(u->sess, davNotify, u); |
| 48 + | + ne_set_notifier(u->sess, davNotify, u); |
| 49 + | |
| 50 + | ne_set_persist(u->sess, 1); |
| 51 + | ne_set_read_timeout(u->sess, httpTimeoutSecs); |
| 52 + | diff -Naur tmp-old/rpmio/rpmurl.h tmp-new/rpmio/rpmurl.h |
| 53 + | --- rpmio/rpmurl.h 2008-03-28 04:55:02.000000000 +0000 |
| 54 + | +++ rpmio/rpmurl.h 2008-03-28 04:56:09.000000000 +0000 |
| 55 + | |
| 56 + | void * sess; /*!< neon: ne_session ptr */ |
| 57 + | off_t current; /*!< neon: current body offset. */ |
| 58 + | off_t total; /*!< neon: total body length. */ |
| 59 + | - int connstatus; /*!< neon: connection status. */ |
| 60 + | + int sessionstatus; /*!< neon: session status. */ |
| 61 + | #ifdef REFERENCE |
| 62 + | typedef enum { |
| 63 + | ne_conn_namelookup, /* lookup up hostname (info = hostname) */ |