Parent Directory
|
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
Tagged 1.2.11
Update licence headers.
Merge r412612 from trunk to 1.2.x branch Original message: Simplify cleanup run.
Merge r412390 from trunk to 1.2.x branch Original message: Adjust cleanup_kill calls to new wrappers.
Merge r412372 from trunk to 1.2.x branch Original message: Don't cast cleanup functions, provide wrappers instead.
Merge r412252 from trunk to 1.2.x branch. Original message: Properly free results table.
Merge r412246 from trunk to 1.2.x branch. Original message: Don't store -1 into size_t field (a *really* big number on 64-bit machine :-) Free allocated memory, not memory used by the pointer.
Merge r384327 from trunk into the 1.2.x branch. Original log message: Add or correct bounds checking for sqlite dbd backends. Submitted by: Bojan Smojver <bojan rexursive.com> * dbd/apr_dbd_sqlite2.c (dbd_sqlite_get_entry): Add bounds checking. * dbd/apr_dbd_sqlite3.c (dbd_sqlite3_get_entry): Correct bounds checking on negative values.
Merge r372724 to 1.2.x. Original log message: Fix the escape implementation in the sqlite dbd back ends. Submitted by: Ronen Mizrahi <ronen tversity.com> Tests by: rooneg * dbd/apr_dbd_sqlite2.c (dbd_sqlite_escape): Use the %q format string. * dbd/apr_dbd_sqlite3.c (dbd_sqlite_escape): Ditto. * test/testdbd.c (test_escape): New test. (test_dbd_generic): Call test_escape. * CHANGES: Note fix.
Merge r332321 into 1.2.x. Original log message: We don't want '//' comments
Branch 1.2.x
* include/private/apr_dbd_internal.h: Include public header; remove duplicate typedefs and use of APR_DBD_INTERNAL. * include/apr_dbd.h: Unconditionally define the typedefs. * dbd/apr_dbd_sqlite2.c, dbd/apr_dbd_sqlite3.c, dbd/apr_dbd_pgsql.c: Include just the private header; remove duplicate typedefs and use of APR_DBD_INTERNAL.
Be a bit more correct in our handling of varargs in the DBD code. * include/private/apr_dbd_internal.h (apr_dbd_driver_t::pvquery, apr_dbd_driver_t::pvselect): take a va_list, not ... * dbd/apr_dbd_sqlite2.c (dbd_sqlite_pvquery, dbd_sqlite_pvselect): take a va_list arg. not that it really matters since this just returns ENOTIMPL... * dbd/apr_dbd_sqlite3.c (dbd_sqlite3_pvquery, dbd_sqlite3_pvselect): ditto. * dbd/apr_dbd_pgsql.c (dbd_pgsql_pvquery, dbd_pgsql_pvselect): take va_list args, as such stop doing va_start and va_end, since it's already been done in the upper level wrapper function.
Remove conditional include from apr_dbd.h. That means putting it explicitly in to all the drivers. *sigh*
fix eol-style
- Rewrite the DBD tests to use the ABTS framework. - Move old tests to test/dbd.c - sqlite2 support, based on Ryan's patch. Changes to pass the tests and build on my debian machine. Submitted By: Ryan Phillips <ryan trolocsis.com> PR: 34078
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
| apache@apache.org | ViewVC Help |
| Powered by ViewVC 1.1.2 |