← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/bindings/javahl/native/InputStream.cpp

  • 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/bindings/javahl/native/InputStream.cpp
54
54
  // Create a stream with this as the baton and set the read and
55
55
  // close functions.
56
56
  svn_stream_t *ret = svn_stream_create(this, pool.getPool());
57
 
  svn_stream_set_read(ret, InputStream::read);
 
57
  svn_stream_set_read2(ret, InputStream::read,
 
58
                       NULL /* only partial read support */);
58
59
  svn_stream_set_close(ret, InputStream::close);
59
60
  return ret;
60
61
}
68
69
 */
69
70
svn_error_t *InputStream::read(void *baton, char *buffer, apr_size_t *len)
70
71
{
 
72
  if (0 == *len)
 
73
    return SVN_NO_ERROR;
 
74
 
71
75
  JNIEnv *env = JNIUtil::getEnv();
72
76
  // An object of our class is passed in as the baton.
73
77
  InputStream *that = static_cast<InputStream *>(baton);