3e59f041da
remove dead code
2014-02-17 19:04:01 +02:00
b2cd56c3cb
Move code out, that handles the actual structure to be used for the decoded
...
data. Will make it easier to add different structures
2014-02-17 18:37:08 +02:00
c1141d43e9
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-28 15:38:14 +02:00
6b77c3aaa1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:33:16 +02:00
79cbcd9ded
add text for the new constants
2014-01-28 15:32:59 +02:00
a87125c1e8
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-28 15:24:45 +02:00
d3faae03ec
add new consts
2014-01-28 15:23:41 +02:00
350b5dddac
WS
2014-01-24 12:31:19 +02:00
cd2cc7b8f9
Reduce code duplication a bit
2014-01-24 11:52:35 +02:00
0c90c207a7
Backport refactoring from php-src
2014-01-24 11:39:24 +02:00
4d43e2efdb
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-21 16:38:32 +01:00
09eb3cf381
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-21 16:37:02 +01:00
2311ba7d3f
Fix bug #66283 (Segmentation fault after memory_limit)
...
There are situations where mysqlnd dupliates zvals while freeing result
sets. If the memory_limit is reached during this operation the engine
will bailout. This patch makes sure that a later attempt (during
RSHIUTDOWN) won't cause a double free, instead we rely on the engine to
free emalloc()ed memory after bailout.
2014-01-21 16:28:30 +01:00
45d46d7edd
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-10 16:02:46 +01:00
98e06a10d3
fix encoding
2014-01-10 15:57:40 +01:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
97909ef4ef
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-04 12:39:11 +02:00
ceb1b7e20f
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-04 12:07:18 +02:00
86aad97979
Fix loss of precision
2013-12-04 12:06:59 +02:00
22ad8e1b1a
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.24-dev now
merge fix
add test
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-27 00:18:54 -08:00
5a3886f15c
merge fix
2013-11-26 19:15:30 +02:00
40dc242904
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c
2013-11-26 19:02:45 +02:00
74ba88e186
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-26 19:01:49 +02:00
696d286911
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed test
And here is the real fix for #66124
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:29:35 +01:00
763f4aef8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-21 21:29:37 +02:00
ce09822269
And here is the real fix for #66124
2013-11-21 21:29:21 +02:00
2a94494b7e
Merge branch 'PHP-5.5'
2013-11-05 11:09:08 +08:00
d4f5ca467f
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
configure.in
ext/mysqlnd/mysqlnd.c
main/php_version.h
2013-11-05 11:08:09 +08:00
d3fd163d27
Typo fix: umknown -> unknown
2013-10-31 23:12:41 +02:00
55ee543e2f
Typo fix: umknown -> unknown
2013-10-31 22:59:42 +02:00
611122c22e
Merge branch '2Guploads'
...
* 2Guploads:
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
unify stdint type usage
2013-08-09 11:47:25 +02:00
42dbc598dd
Merge branch 'PHP-5.5'
2013-08-08 13:53:08 +02:00
82a7ec72de
add some tracing
2013-08-08 13:51:55 +02:00
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
963c1be38d
Merge branch 'PHP-5.5'
2013-08-05 17:16:05 +02:00
85b7e9f046
Check for NULL ptr from get_stream() before passing it on to php_stream_cast()
2013-08-05 16:58:37 +02:00
68e8326e0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
non living code related typo fixes
2013-08-04 16:07:13 -07:00
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
a047ece2e0
Disable a flag
2013-07-22 11:02:48 +02:00
2c3f6dcdb6
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
...
Conflicts:
NEWS
2013-07-08 20:28:51 +02:00
dd71f1f173
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
2013-07-08 20:27:14 +02:00
e78ca0b634
Merge branch 'master' of ssh://git.php.net/php-src
2013-07-08 20:26:38 +02:00
3dd5f4ae4c
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
NEWS
2013-07-08 20:24:58 +02:00
9fc38183b7
Fixed segfault in mysqlnd when doing long prepare
2013-07-08 20:23:32 +02:00
Andrey Hristov