You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/09/17 17:09:17 UTC
svn commit: r1703645 [3/3] - in /subversion/branches/reuse-ra-session: ./
build/generator/ build/generator/templates/ subversion/ subversion/include/
subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_delta/ subversion/libsvn_diff/...
Modified: subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs/fs-test.c?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs/fs-test.c Thu Sep 17 15:09:12 2015
@@ -4969,7 +4969,7 @@ unordered_txn_dirprops(const svn_test_op
/* Commit the first one first. */
SVN_ERR(test_commit_txn(&new_rev, txn, NULL, pool));
- /* Some backends are clever then others. */
+ /* Some backends are cleverer than others. */
if (is_bdb)
{
/* Then commit the second -- but expect an conflict because the
@@ -5591,7 +5591,7 @@ dir_prop_merge(const svn_test_opts_t *op
SVN_ERR(svn_fs_abort_txn(c_txn, pool));
/* Changes in a sub-tree should not conflict with prop changes to some
- parent directory but some backends are clever then others. */
+ parent directory but some backends are cleverer than others. */
if (is_bdb)
{
SVN_ERR(test_commit_txn(&head_rev, top_txn, "/A", pool));
Modified: subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c Thu Sep 17 15:09:12 2015
@@ -1343,8 +1343,9 @@ plain_0_length(const svn_test_opts_t *op
memcpy(rev_contents->data + offset, noderev_str->data, noderev_str->len);
}
- SVN_ERR(svn_io_write_atomic(rev_path, rev_contents->data,
- rev_contents->len, NULL, pool));
+ SVN_ERR(svn_io_write_atomic2(rev_path, rev_contents->data,
+ rev_contents->len, NULL, FALSE,
+ pool));
if (svn_fs_fs__use_log_addressing(fs))
{
Modified: subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/fs-x-pack-test.c?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/fs-x-pack-test.c (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/libsvn_fs_x/fs-x-pack-test.c Thu Sep 17 15:09:12 2015
@@ -61,8 +61,8 @@ write_format(const char *path,
"layout sharded %d\n",
format, max_files_per_dir);
- SVN_ERR(svn_io_write_atomic(path, contents, strlen(contents),
- NULL /* copy perms */, pool));
+ SVN_ERR(svn_io_write_atomic2(path, contents, strlen(contents),
+ NULL /* copy perms */, FALSE, pool));
/* And set the perms to make it read only */
return svn_io_set_file_read_only(path, FALSE, pool);
Modified: subversion/branches/reuse-ra-session/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/libsvn_repos/repos-test.c?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/libsvn_repos/repos-test.c Thu Sep 17 15:09:12 2015
@@ -3375,26 +3375,26 @@ test_config_pool(const svn_test_opts_t *
svn_stringbuf_appendcstr(cfg_buffer2, "\n[more]\nU=\"X\"\n");
/* write them to 2x2 files */
- SVN_ERR(svn_io_write_atomic(svn_dirent_join(wrk_dir,
- "config-pool-test1.cfg",
- pool),
- cfg_buffer1->data, cfg_buffer1->len, NULL,
- pool));
- SVN_ERR(svn_io_write_atomic(svn_dirent_join(wrk_dir,
- "config-pool-test2.cfg",
- pool),
- cfg_buffer1->data, cfg_buffer1->len, NULL,
- pool));
- SVN_ERR(svn_io_write_atomic(svn_dirent_join(wrk_dir,
- "config-pool-test3.cfg",
- pool),
- cfg_buffer2->data, cfg_buffer2->len, NULL,
- pool));
- SVN_ERR(svn_io_write_atomic(svn_dirent_join(wrk_dir,
- "config-pool-test4.cfg",
- pool),
- cfg_buffer2->data, cfg_buffer2->len, NULL,
- pool));
+ SVN_ERR(svn_io_write_atomic2(svn_dirent_join(wrk_dir,
+ "config-pool-test1.cfg",
+ pool),
+ cfg_buffer1->data, cfg_buffer1->len, NULL,
+ FALSE, pool));
+ SVN_ERR(svn_io_write_atomic2(svn_dirent_join(wrk_dir,
+ "config-pool-test2.cfg",
+ pool),
+ cfg_buffer1->data, cfg_buffer1->len, NULL,
+ FALSE, pool));
+ SVN_ERR(svn_io_write_atomic2(svn_dirent_join(wrk_dir,
+ "config-pool-test3.cfg",
+ pool),
+ cfg_buffer2->data, cfg_buffer2->len, NULL,
+ FALSE, pool));
+ SVN_ERR(svn_io_write_atomic2(svn_dirent_join(wrk_dir,
+ "config-pool-test4.cfg",
+ pool),
+ cfg_buffer2->data, cfg_buffer2->len, NULL,
+ FALSE, pool));
/* requesting a config over and over again should return the same
(even though it is not being referenced) */
Modified: subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/checksum-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/checksum-test.c?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/checksum-test.c (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/checksum-test.c Thu Sep 17 15:09:12 2015
@@ -274,6 +274,28 @@ test_serialization(apr_pool_t *pool)
return SVN_NO_ERROR;
}
+static svn_error_t *
+test_checksum_parse_all_zero(apr_pool_t *pool)
+{
+ svn_checksum_kind_t kind;
+ for (kind = svn_checksum_md5; kind <= svn_checksum_fnv1a_32x4; ++kind)
+ {
+ svn_checksum_t *checksum;
+ const char *hex;
+
+ checksum = svn_checksum_create(kind, pool);
+
+ hex = svn_checksum_to_cstring_display(checksum, pool);
+ SVN_ERR(svn_checksum_parse_hex(&checksum, kind, hex, pool));
+
+ /* All zeroes checksum is NULL by definition. See
+ svn_checksum_parse_hex().*/
+ SVN_TEST_ASSERT(checksum == NULL);
+ }
+
+ return SVN_NO_ERROR;
+}
+
/* An array of all test functions */
static int max_threads = 1;
@@ -293,6 +315,8 @@ static struct svn_test_descriptor_t test
"zero checksum cross-type matching"),
SVN_TEST_PASS2(test_serialization,
"checksum (de-)serialization"),
+ SVN_TEST_PASS2(test_checksum_parse_all_zero,
+ "checksum parse all zero"),
SVN_TEST_NULL
};
Modified: subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/stream-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/stream-test.c?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/stream-test.c (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/libsvn_subr/stream-test.c Thu Sep 17 15:09:12 2015
@@ -32,74 +32,6 @@
#include "../svn_test.h"
-struct stream_baton_t
-{
- svn_filesize_t capacity_left;
- char current;
- apr_size_t max_read;
-};
-
-/* Implements svn_stream_t.read_fn. */
-static svn_error_t *
-read_handler(void *baton,
- char *buffer,
- apr_size_t *len)
-{
- struct stream_baton_t *btn = baton;
- int i;
-
- /* Cap the read request to what we actually support. */
- if (btn->max_read < *len)
- *len = btn->max_read;
- if (btn->capacity_left < *len)
- *len = (apr_size_t)btn->capacity_left;
-
- /* Produce output */
- for (i = 0; i < *len; ++i)
- {
- buffer[i] = btn->current + 1;
- btn->current = (btn->current + 1) & 0x3f;
-
- btn->capacity_left--;
- }
-
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-data_available_handler(void *baton,
- svn_boolean_t *data_available)
-{
- struct stream_baton_t *btn = baton;
- *data_available = btn->capacity_left > 0;
-
- return SVN_NO_ERROR;
-}
-
-/* Return a stream that produces CAPACITY characters in chunks of at most
- * MAX_READ chars. The first char will be '\1' followed by '\2' etc. up
- * to '\x40' and then repeating the cycle until the end of the stream.
- * Allocate the result in RESULT_POOL. */
-static svn_stream_t *
-create_test_read_stream(svn_filesize_t capacity,
- apr_size_t max_read,
- apr_pool_t *result_pool)
-{
- svn_stream_t *stream;
- struct stream_baton_t *baton;
-
- baton = apr_pcalloc(result_pool, sizeof(*baton));
- baton->capacity_left = capacity;
- baton->current = 0;
- baton->max_read = max_read;
-
- stream = svn_stream_create(baton, result_pool);
- svn_stream_set_read2(stream, read_handler, NULL);
- svn_stream_set_data_available(stream, data_available_handler);
-
- return stream;
-}
-
/*------------------------ Tests --------------------------- */
static svn_error_t *
@@ -872,70 +804,6 @@ test_stream_compressed_read_full(apr_poo
return SVN_NO_ERROR;
}
-/* Utility function verifying that LINE contains LENGTH characters read
- * from a stream returned by create_test_read_stream(). C is the first
- * character expected in LINE. */
-static svn_error_t *
-expect_line_content(svn_stringbuf_t *line,
- char start,
- apr_size_t length)
-{
- apr_size_t i;
- char c = start - 1;
-
- SVN_TEST_ASSERT(line->len == length);
- for (i = 0; i < length; ++i)
- {
- SVN_TEST_ASSERT(line->data[i] == c + 1);
- c = (c + 1) & 0x3f;
- }
-
- return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-test_stream_buffered_wrapper(apr_pool_t *pool)
-{
- apr_pool_t *iterpool = svn_pool_create(pool);
- svn_stringbuf_t *line;
- svn_boolean_t eof = FALSE;
- apr_size_t read = 0;
-
- /* At least a few stream chunks (16k) worth of data. */
- const apr_size_t stream_length = 100000;
-
- /* Our source stream delivers data in very small chunks only.
- * This requires multiple reads per line while readline will hold marks
- * etc. */
- svn_stream_t *stream = create_test_read_stream(stream_length, 19, pool);
- stream = svn_stream_wrap_buffered_read(stream, pool);
-
- /* We told the stream not to supports seeking to the start. */
- SVN_TEST_ASSERT_ERROR(svn_stream_seek(stream, NULL),
- SVN_ERR_STREAM_SEEK_NOT_SUPPORTED);
-
- /* Read all lines. Check EOF detection. */
- while (!eof)
- {
- /* The local pool ensures that marks get cleaned up. */
- svn_pool_clear(iterpool);
- SVN_ERR(svn_stream_readline(stream, &line, "\n", &eof, iterpool));
-
- /* Verify that we read the correct data and the full stream. */
- if (read == 0)
- SVN_ERR(expect_line_content(line, 1, '\n' - 1));
- else if (eof)
- SVN_ERR(expect_line_content(line, '\n' + 1, stream_length - read));
- else
- SVN_ERR(expect_line_content(line, '\n' + 1, 63));
-
- /* Update bytes read. */
- read += line->len + 1;
- }
-
- return SVN_NO_ERROR;
-}
-
/* The test table. */
static int max_threads = 1;
@@ -967,8 +835,6 @@ static struct svn_test_descriptor_t test
"test svn_stringbuf_from_stream"),
SVN_TEST_PASS2(test_stream_compressed_read_full,
"test compression for streams without partial read"),
- SVN_TEST_PASS2(test_stream_buffered_wrapper,
- "test buffering read stream wrapper"),
SVN_TEST_NULL
};
Modified: subversion/branches/reuse-ra-session/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh (original)
+++ subversion/branches/reuse-ra-session/tools/buildbot/slaves/bb-openbsd/svncheck-bindings.sh Thu Sep 17 15:09:12 2015
@@ -25,7 +25,7 @@ set -x
branch="$(basename $(svn info . | grep ^URL | cut -d' ' -f2))"
export MALLOC_OPTIONS=S
(cd .. && gmake BRANCH="$branch" THREADING="no" ENABLE_PERL_BINDINGS="no" svn-check-bindings)
-grep -q "^Result: PASS$" tests.log.bindings.pl || exit 1
+#grep -q "^Result: PASS$" tests.log.bindings.pl || exit 1
grep -q "^OK$" tests.log.bindings.py || exit 1
tail -n 1 tests.log.bindings.rb | grep -q ", 0 failures, 0 errors" || exit 1
#TODO javahl
Modified: subversion/branches/reuse-ra-session/tools/client-side/svn-mergeinfo-normalizer/logic.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/tools/client-side/svn-mergeinfo-normalizer/logic.c?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/tools/client-side/svn-mergeinfo-normalizer/logic.c (original)
+++ subversion/branches/reuse-ra-session/tools/client-side/svn-mergeinfo-normalizer/logic.c Thu Sep 17 15:09:12 2015
@@ -824,8 +824,8 @@ remove_lines(svn_min__log_t *log,
continue;
}
- /* We don't know how to handle reverse ranges (there should be none).
- So, we must check for them - just to be sure. */
+ /* We don't know how to handle non-recursive ranges (they are legal,
+ * though). So, we must check for them - just to be sure. */
non_recursive_ranges = find_non_recursive_ranges(subtree_ranges,
iterpool);
if (non_recursive_ranges->nelts)
Modified: subversion/branches/reuse-ra-session/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/tools/dev/unix-build/Makefile.svn?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/reuse-ra-session/tools/dev/unix-build/Makefile.svn Thu Sep 17 15:09:12 2015
@@ -79,7 +79,7 @@ SERF_OLD_VER = 0.3.1
CYRUS_SASL_VER = 2.1.25
SQLITE_VER = 3080500
LIBMAGIC_VER = 5.19
-RUBY_VER = 1.8.7-p358
+RUBY_VER = 1.8.7-p374
BZ2_VER = 1.0.6
PYTHON_VER = 2.7.8
JUNIT_VER = 4.10
@@ -107,7 +107,7 @@ SHA256_${NEON_DIST} = 2962cfcb5d30f3272e
SHA256_${CYRUS_SASL_DIST} = 418c16e6240a4f9b637cbe3d62937b9675627bad27c622191d47de8686fe24fe
SHA256_${SQLITE_DIST} = 98c33abe4106e508e73fda648b2657ac9e969fe24695f543dcde68cc71f3091b
SHA256_${LIBMAGIC_DIST} = 9484b3bbda1acc7b13a4f71031a85ce10c77bd0ffec7226741a219ef587e3a7c
-SHA256_${RUBY_DIST} = 9e0856d58830e08f1e38233947d859898ae09d4780cb1a502108e41308de33cb
+SHA256_${RUBY_DIST} = 876eeeaaeeab10cbf4767833547d66d86d6717ef48fd3d89e27db8926a65276c
SHA256_${BZ2_DIST} = a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd
SHA256_${PYTHON_DIST} = 74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557
SHA256_${JUNIT_DIST} = 36a747ca1e0b86f6ea88055b8723bb87030d627766da6288bf077afdeeb0f75a
@@ -156,7 +156,7 @@ SERF_OLD_URL = https://svn.apache.org/re
SQLITE_URL = https://www.sqlite.org/2014/$(SQLITE_DIST)
CYRUS_SASL_URL = ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/$(CYRUS_SASL_DIST)
LIBMAGIC_URL = ftp://ftp.astron.com/pub/file/$(LIBMAGIC_DIST)
-RUBY_URL = http://ftp.ruby-lang.org/pub/ruby/1.8/$(RUBY_DIST)
+RUBY_URL = https://cache.ruby-lang.org/pub/ruby/1.8/$(RUBY_DIST)
BZ2_URL = http://bzip.org/$(BZ2_VER)/$(BZ2_DIST)
PYTHON_URL = https://python.org/ftp/python/$(PYTHON_VER)/$(PYTHON_DIST)
JUNIT_URL = https://downloads.sourceforge.net/project/junit/junit/$(JUNIT_VER)/$(JUNIT_DIST)
@@ -597,6 +597,8 @@ httpd-reset:
httpd-clean:
-(cd $(HTTPD_OBJDIR) && env MAKEFLAGS= make clean)
+ -rm ${HTTPD_OBJDIR}/chil-engine.diff
+ -rm ${HTTPD_OBJDIR}/ssl3.diff
# fetch distfile for httpd
$(DISTDIR)/$(HTTPD_DIST):
@@ -620,14 +622,31 @@ $(HTTPD_OBJDIR)/chil-engine.diff:
echo >>$@.tmp ' ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,'
mv -f $@.tmp $@
+$(HTTPD_OBJDIR)/ssl3.diff:
+ mkdir -p $(dir $@)
+ echo >$@.tmp '--- support/ab.c.orig Mon Sep 14 15:33:46 2015'
+ echo >>$@.tmp '+++ support/ab.c Mon Sep 14 15:34:15 2015'
+ echo >>$@.tmp '@@ -2232,8 +2232,10 @@'
+ echo >>$@.tmp ' } else if (strncasecmp(optarg, "SSL2", 4) == 0) {'
+ echo >>$@.tmp ' meth = SSLv2_client_method();'
+ echo >>$@.tmp ' #endif'
+ echo >>$@.tmp '+#ifndef OPENSSL_NO_SSL3'
+ echo >>$@.tmp ' } else if (strncasecmp(optarg, "SSL3", 4) == 0) {'
+ echo >>$@.tmp ' meth = SSLv3_client_method();'
+ echo >>$@.tmp '+#endif'
+ echo >>$@.tmp ' #ifdef HAVE_TLSV1_X'
+ echo >>$@.tmp ' } else if (strncasecmp(optarg, "TLS1.1", 6) == 0) {'
+ echo >>$@.tmp ' meth = TLSv1_1_client_method();'
+ mv -f $@.tmp $@
# retrieve httpd
$(HTTPD_OBJDIR)/.retrieved: $(DISTDIR)/$(HTTPD_DIST) \
- $(HTTPD_OBJDIR)/chil-engine.diff
+ $(HTTPD_OBJDIR)/chil-engine.diff $(HTTPD_OBJDIR)/ssl3.diff
$(call do_check_sha256,$(HTTPD_DIST))
[ -d $(HTTPD_OBJDIR) ] || mkdir -p $(HTTPD_OBJDIR)
tar -C $(SRCDIR) -zxf $(DISTDIR)/$(HTTPD_DIST)
cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/chil-engine.diff
+ cd $(HTTPD_SRCDIR) && patch -p0 < $(HTTPD_OBJDIR)/ssl3.diff
cp $(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h \
$(HTTPD_SRCDIR)/modules/ssl/ssl_toolkit_compat.h.orig
sed '/^#define HAVE_SSL_RAND_EGD/d' \
@@ -1053,6 +1072,11 @@ $(RUBY_OBJDIR)/.retrieved: $(DISTDIR)/$(
$(call do_check_sha256,$(RUBY_DIST))
[ -d $(RUBY_OBJDIR) ] || mkdir -p $(RUBY_OBJDIR)
tar -C $(SRCDIR) -zxf $(DISTDIR)/$(RUBY_DIST)
+ grep -v 'OSSL_SSL_METHOD_ENTRY(SSLv3' \
+ $(RUBY_SRCDIR)/ext/openssl/ossl_ssl.c > \
+ $(RUBY_SRCDIR)/ext/openssl/ossl_ssl.c.nossl3
+ mv $(RUBY_SRCDIR)/ext/openssl/ossl_ssl.c.nossl3 \
+ $(RUBY_SRCDIR)/ext/openssl/ossl_ssl.c
touch $@
ifeq ($(THREADING),yes)
Modified: subversion/branches/reuse-ra-session/tools/dev/x509-parser.c
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/tools/dev/x509-parser.c?rev=1703645&r1=1703644&r2=1703645&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/tools/dev/x509-parser.c (original)
+++ subversion/branches/reuse-ra-session/tools/dev/x509-parser.c Thu Sep 17 15:09:12 2015
@@ -158,7 +158,7 @@ int main (int argc, const char *argv[])
}
else if (argc == 1)
{
- err = svn_stream_for_stdin(&in, pool);
+ err = svn_stream_for_stdin2(&in, TRUE, pool);
}
else
err = svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, _("Too many arguments"));