← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/libsvn_client/switch.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_client/switch.c
231
231
        yca = NULL; /* Not versioned */
232
232
      else
233
233
        {
234
 
          /* ### It would be nice if this function could reuse the existing
235
 
             ra session instead of opening two for its own use. */
236
234
          SVN_ERR(svn_client__get_youngest_common_ancestor(
237
235
                  &yca, switch_loc, target_base_loc, ra_session, ctx,
238
236
                  pool, pool));
340
338
  *timestamp_sleep = TRUE;
341
339
 
342
340
  /* Drive the reporter structure, describing the revisions within
343
 
     PATH.  When we call reporter->finish_report, the update_editor
344
 
     will be driven by svn_repos_dir_delta2. */
 
341
     LOCAL_ABSPATH.  When this calls reporter->finish_report, the
 
342
     reporter will drive the switch_editor. */
345
343
  SVN_ERR(svn_wc_crawl_revisions5(ctx->wc_ctx, local_abspath, reporter,
346
344
                                  report_baton, TRUE,
347
345
                                  depth, (! depth_is_sticky),
367
365
                                           new_depths,
368
366
                                           switch_loc->repos_root_url,
369
367
                                           local_abspath,
370
 
                                           depth, timestamp_sleep,
 
368
                                           depth, timestamp_sleep, ra_session,
371
369
                                           ctx, pool));
372
370
    }
373
371
 
382
380
        = svn_wc_notify_state_inapplicable;
383
381
      notify->lock_state = svn_wc_notify_lock_state_inapplicable;
384
382
      notify->revision = revnum;
385
 
      (*ctx->notify_func2)(ctx->notify_baton2, notify, pool);
 
383
      ctx->notify_func2(ctx->notify_baton2, notify, pool);
386
384
    }
387
385
 
388
386
  /* If the caller wants the result revision, give it to them. */