Parent Directory
| 
Revision Log
| Links to HEAD: | (view) (annotate) |
| Sticky Revision: |
Tagged 1.2.11
Update licence headers.
Merge r413798 and r414125 from trunk to 1.2.x branch. Original message: Don't expect variable argument list to end with NULL for PostgreSQL and SQLite3 DBD drivers. Count instead.
Merge r412384 from trunk to 1.2.x branch Original message: Don't cast cleanup functions, provide wrappers instead (PgSQL, SQLite3).
Rework r399093, r399948, r406009 from trunk to apply to 1.2.x branch. Original message: Implement prepared statement support in SQLite3 DBD driver.
On a non-threaded platform that has sqlite3, apr_dbd_sqlite3.c does not compile because it invokes the mutex lock functions unconditionally. (This ugly fix using #ifdef has already been solved in a cleaner fashion in the httpd-2.3 version.)
Merge r398048 from the trunk.
Rework commit 396309 from trunk to apply to 1.2.x (mutex lock code adjustment required to merge)
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 r384320 from trunk into the 1.2.x branch. Original log message: Correct allocate space for column names in the sqlite3 dbd implementation. Submitted by: Bojan Smojver <bojan rexursive.com> * dbd/apr_dbd_sqlite3.c (apr_dbd_results_t): Add col_names member. (dbd_sqlite3_select): Initialize col_names and copy the names of the columns into it.
Merge r233488 from trunk Original log message: Support float in sqlite3 driver (patch by Rick Keiner)
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.
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*
* dbd/apr_dbd_sqlite3.c: Code style fixes; no functional change.
* dbd/apr_dbd_sqlite3.c (dbd_sqlite3_select): Initialize retry_count to zero. (dbd_sqlite3_get_row): Remove unused variables. (dbd_sqlite3_query): Remove unused variable. * test/Makefile.in (CLEAN_TARGETS): Clean up test output.
SQLite3 transaction patch (submitted by Rick Keiner)
set EOL Style = native.
dbd/apr_dbd_sqlite3.c was supposed to be added in r168388. svn add is a hard command to master.
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 |