Changeset 502

Timestamp:

Jun 13, 2006 10:25:05 PM (18 years ago)

Author:

bennylp

Message:

Fixed bugs in client authentication: (1)tx_data in reinit_req() is not invalidated, and (2)caching caused multiple identical authorization headers to be sent in one request

File:

• pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_auth_client.c

@@ -611 +611 @@
                         hauth = pjsip_hdr_shallow_clone(tdata->pool, entry->hdr);
                         pjsip_msg_add_hdr(tdata->msg, (pjsip_hdr*)hauth);
-                    } else {
-#                       if defined(PJSIP_AUTH_AUTO_SEND_NEXT) && \
-                           PJSIP_AUTH_AUTO_SEND_NEXT!=0
-                        {
-                            new_auth_for_req( tdata, sess, auth, NULL);
-                        }
-#                       endif
+                        break;
                     }
                     entry = entry->next;
                 }
+
+#               if defined(PJSIP_AUTH_AUTO_SEND_NEXT) && \
+                           PJSIP_AUTH_AUTO_SEND_NEXT!=0
+                {
+                    if (entry == &auth->cached_hdr)
+                        new_auth_for_req( tdata, sess, auth, NULL);
+                }
+#               endif
+
             }
 #           elif defined(PJSIP_AUTH_AUTO_SEND_NEXT) && \
@@ -826 +829 @@
     via->branch_param.slen = 0;
 
+    /* Must invalidate the message! */
+    pjsip_tx_data_invalidate_msg(tdata);
+
     /* Increment reference counter. */
     pjsip_tx_data_add_ref(tdata);