1 diff -urNp php-5.4.17.orig/ext/sqlite3/libsqlite/sqlite3.c php-5.4.17/ext/sqlite3/libsqlite/sqlite3.c
2 --- php-5.4.17.orig/ext/sqlite3/libsqlite/sqlite3.c 2013-07-03 06:10:53.000000000 +0000
3 +++ php-5.4.17/ext/sqlite3/libsqlite/sqlite3.c 2013-07-18 14:37:33.000000000 +0000
4 @@ -11864,7 +11864,7 @@ SQLITE_PRIVATE int sqlite3MemdebugNoTy
6 *************************************************************************
8 -** This file contains definitions of global variables and contants.
9 +** This file contains definitions of global variables and constants.
12 /* An array to map all upper-case characters into their corresponding
13 @@ -16130,7 +16130,7 @@ SQLITE_PRIVATE const sqlite3_mem_methods
14 ** 1. All memory allocations sizes are rounded up to a power of 2.
16 ** 2. If two adjacent free blocks are the halves of a larger block,
17 -** then the two blocks are coalesed into the single larger block.
18 +** then the two blocks are coalesced into the single larger block.
20 ** 3. New memory is allocated from the first available free block.
22 @@ -18139,7 +18139,7 @@ SQLITE_API sqlite3_int64 sqlite3_soft_he
23 sqlite3_int64 priorLimit;
25 #ifndef SQLITE_OMIT_AUTOINIT
26 - sqlite3_initialize();
27 + if( sqlite3_initialize() ) return 0;
29 sqlite3_mutex_enter(mem0.mutex);
30 priorLimit = mem0.alarmThreshold;
31 @@ -20926,7 +20926,7 @@ do_atof_calc:
32 /* store the result */
35 - /* return true if number and no extra non-whitespace chracters after */
36 + /* return true if number and no extra non-whitespace characters after */
37 return z>=zEnd && nDigits>0 && eValid;
39 return !sqlite3Atoi64(z, pResult, length, enc);
40 @@ -30074,7 +30074,7 @@ static int unixGetLastError(sqlite3_vfs
41 ** setting the environment variable SQLITE_FORCE_PROXY_LOCKING to 1 will
42 ** force proxy locking to be used for every database file opened, and 0
43 ** will force automatic proxy locking to be disabled for all database
44 -** files (explicity calling the SQLITE_SET_LOCKPROXYFILE pragma or
45 +** files (explicitly calling the SQLITE_SET_LOCKPROXYFILE pragma or
46 ** sqlite_file_control API is not affected by SQLITE_FORCE_PROXY_LOCKING).
49 @@ -69899,7 +69899,7 @@ SQLITE_PRIVATE int sqlite3MemJournalSize
52 ** Walk an expression tree. Invoke the callback once for each node
53 -** of the expression, while decending. (In other words, the callback
54 +** of the expression, while descending. (In other words, the callback
55 ** is invoked before visiting children.)
57 ** The return value from the callback should be one of the WRC_*
58 @@ -70936,7 +70936,7 @@ static int resolveOrderGroupBy(
62 -** Resolve names in the SELECT statement p and all of its descendents.
63 +** Resolve names in the SELECT statement p and all of its descendants.
65 static int resolveSelectStep(Walker *pWalker, Select *p){
66 NameContext *pOuterNC; /* Context that contains this SELECT */
67 @@ -71244,7 +71244,7 @@ SQLITE_PRIVATE void sqlite3ResolveSelect
68 ** affinity of that column is returned. Otherwise, 0x00 is returned,
69 ** indicating no affinity for the expression.
71 -** i.e. the WHERE clause expresssions in the following statements all
72 +** i.e. the WHERE clause expressions in the following statements all
75 ** CREATE TABLE t1(a);
76 @@ -74260,13 +74260,13 @@ static int evalConstExpr(Walker *pWalker
79 ** Preevaluate constant subexpressions within pExpr and store the
80 -** results in registers. Modify pExpr so that the constant subexpresions
81 +** results in registers. Modify pExpr so that the constant subexpressions
82 ** are TK_REGISTER opcodes that refer to the precomputed values.
84 ** This routine is a no-op if the jump to the cookie-check code has
85 ** already occur. Since the cookie-check jump is generated prior to
86 ** any other serious processing, this check ensures that there is no
87 -** way to accidently bypass the constant initializations.
88 +** way to accidentally bypass the constant initializations.
90 ** This routine is also a no-op if the SQLITE_FactorOutConst optimization
91 ** is disabled via the sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS)
92 @@ -75132,7 +75132,7 @@ static void renameParentFunc(
93 ** ALTER TABLE command. The first argument is the text of a CREATE TRIGGER
94 ** statement. The second is a table name. The table name in the CREATE
95 ** TRIGGER statement is replaced with the third argument and the result
96 -** returned. This is analagous to renameTableFunc() above, except for CREATE
97 +** returned. This is analogous to renameTableFunc() above, except for CREATE
98 ** TRIGGER, not CREATE INDEX and CREATE TABLE.
100 static void renameTriggerFunc(
101 @@ -86752,7 +86752,7 @@ static int xferOptimization(
104 #ifndef SQLITE_OMIT_FOREIGN_KEY
105 - /* Disallow the transfer optimization if the destination table constains
106 + /* Disallow the transfer optimization if the destination table constrains
107 ** any foreign key constraints. This is more restrictive than necessary.
108 ** But the main beneficiary of the transfer optimization is the VACUUM
109 ** command, and the VACUUM command disables foreign key constraints. So
110 @@ -93175,7 +93175,7 @@ static int flattenSubquery(
111 pSubSrc = pSub->pSrc;
113 /* Prior to version 3.1.2, when LIMIT and OFFSET had to be simple constants,
114 - ** not arbitrary expresssions, we allowed some combining of LIMIT and OFFSET
115 + ** not arbitrary expressions, we allowed some combining of LIMIT and OFFSET
116 ** because they could be computed at compile-time. But when LIMIT and OFFSET
117 ** became arbitrary expressions, we were forced to add restrictions (13)
119 @@ -94472,7 +94472,7 @@ SQLITE_PRIVATE int sqlite3Select(
122 KeyInfo *pKeyInfo; /* Keying information for the group by clause */
123 - int j1; /* A-vs-B comparision jump */
124 + int j1; /* A-vs-B comparison jump */
125 int addrOutputRow; /* Start of subroutine that outputs a result row */
126 int regOutputRow; /* Return address register for output subroutine */
127 int addrSetAbort; /* Set the abort flag and return */
128 @@ -118508,7 +118508,7 @@ static int star_oh(const char *z){
131 ** If the word ends with zFrom and xCond() is true for the stem
132 -** of the word that preceds the zFrom ending, then change the
133 +** of the word that precede the zFrom ending, then change the
136 ** The input word *pz and zFrom are both in reverse order. zTo
137 @@ -127688,7 +127688,7 @@ SQLITE_API int sqlite3_extension_init(
138 ** * Implementations of the SQL scalar upper() and lower() functions
141 -** * Integration of ICU and SQLite collation seqences.
142 +** * Integration of ICU and SQLite collation sequences.
144 ** * An implementation of the LIKE operator that uses ICU to
145 ** provide case-independent matching.
146 diff -urNp php-5.4.17.orig/ext/sqlite3/php_sqlite3.h php-5.4.17/ext/sqlite3/php_sqlite3.h
147 --- php-5.4.17.orig/ext/sqlite3/php_sqlite3.h 2013-07-03 06:10:53.000000000 +0000
148 +++ php-5.4.17/ext/sqlite3/php_sqlite3.h 2013-07-18 14:37:33.000000000 +0000
150 #ifndef PHP_SQLITE3_H
151 #define PHP_SQLITE3_H
153 -#define PHP_SQLITE3_VERSION "0.7"
154 +#define PHP_SQLITE3_VERSION "0.7-dev"
156 extern zend_module_entry sqlite3_module_entry;
157 #define phpext_sqlite3_ptr &sqlite3_module_entry
158 diff -urNp php-5.4.17.orig/ext/sqlite3/php_sqlite3_structs.h php-5.4.17/ext/sqlite3/php_sqlite3_structs.h
159 --- php-5.4.17.orig/ext/sqlite3/php_sqlite3_structs.h 2013-07-03 06:10:53.000000000 +0000
160 +++ php-5.4.17/ext/sqlite3/php_sqlite3_structs.h 2013-07-18 14:37:33.000000000 +0000
165 -/* for backwards compatability reasons */
166 +/* for backwards compatibility reasons */
167 #ifndef SQLITE_OPEN_READONLY
168 #define SQLITE_OPEN_READONLY 0x00000001
170 diff -urNp php-5.4.17.orig/ext/sqlite3/tests/bug53463.phpt php-5.4.17/ext/sqlite3/tests/bug53463.phpt
171 --- php-5.4.17.orig/ext/sqlite3/tests/bug53463.phpt 2013-07-03 06:10:53.000000000 +0000
172 +++ php-5.4.17/ext/sqlite3/tests/bug53463.phpt 2013-07-18 14:37:33.000000000 +0000
173 @@ -27,4 +27,4 @@ echo "Done\n";
179 \ No newline at end of file