clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,024 Commits 494 Branches 1,367 Tags 800 MiB
55440b0870
Commit Graph

920 Commits

Author SHA1 Message Date
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Anatol Belski
25e57e702b fix uninitialized value 2014-01-14 09:47:27 +01:00
Andrey Hristov
73008bb5ce More refactoring of the big function generating execute requests 2014-01-14 01:31:16 +02:00
Andrey Hristov
cf9966671c Merge branch 'master' of git.php.net:php-src 2014-01-13 12:40:59 +02:00
Andrey Hristov
01d5e28057 move common code into a function 2014-01-13 12:40:39 +02:00
Johannes Schlüter
82dfe1acc8 Merge branch 'PHP-5.6' 2014-01-10 16:04:29 +01:00
Johannes Schlüter
45d46d7edd Merge branch 'PHP-5.5' into PHP-5.6 2014-01-10 16:02:46 +01:00
Johannes Schlüter
98e06a10d3 fix encoding 2014-01-10 15:57:40 +01:00
Xinchen Hui
0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Kalle Sommer Nielsen
c83598119b Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it 
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
 2013-12-18 09:19:24 +01:00
Andrey Hristov
97909ef4ef Merge branch 'PHP-5.5' into PHP-5.6 2013-12-04 12:39:11 +02:00
Andrey Hristov
ceb1b7e20f Merge branch 'PHP-5.4' into PHP-5.5 2013-12-04 12:07:18 +02:00
Andrey Hristov
86aad97979 Fix loss of precision 2013-12-04 12:06:59 +02:00
Stanislav Malyshev
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
Andrey Hristov
5a3886f15c merge fix 2013-11-26 19:15:30 +02:00
Andrey Hristov
40dc242904 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd.c
 2013-11-26 19:02:45 +02:00
Andrey Hristov
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
Anatol Belski
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
Andrey Hristov
763f4aef8b Merge branch 'PHP-5.4' into PHP-5.5 2013-11-21 21:29:37 +02:00
Andrey Hristov
ce09822269 And here is the real fix for #66124 2013-11-21 21:29:21 +02:00
Xinchen Hui
2a94494b7e Merge branch 'PHP-5.5' 2013-11-05 11:09:08 +08:00
Xinchen Hui
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
Lior Kaplan
d3fd163d27 Typo fix: umknown -> unknown 2013-10-31 23:12:41 +02:00
Martin Hujer
55ee543e2f Typo fix: umknown -> unknown 2013-10-31 22:59:42 +02:00
Michael Wallner
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
Andrey Hristov
42dbc598dd Merge branch 'PHP-5.5' 2013-08-08 13:53:08 +02:00
Andrey Hristov
82a7ec72de add some tracing 2013-08-08 13:51:55 +02:00
Michael Wallner
14caf174ff unify stdint type usage 
if you need C99 stdint types, just include "php_stdint.h"
 2013-08-06 22:49:56 +02:00
Christopher Jones
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
Christopher Jones
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
Kalle Sommer Nielsen
cabf38af6d Merge branch 'PHP-5.4' 2013-08-05 17:23:00 +02:00
Kalle Sommer Nielsen
963c1be38d Merge branch 'PHP-5.5' 2013-08-05 17:16:05 +02:00
Kalle Sommer Nielsen
85b7e9f046 Check for NULL ptr from get_stream() before passing it on to php_stream_cast() 2013-08-05 16:58:37 +02:00
Stanislav Malyshev
68e8326e0e Merge branch 'PHP-5.5' 
* PHP-5.5:
  non living code related typo fixes
 2013-08-04 16:07:13 -07:00
Stanislav Malyshev
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
Veres Lajos
8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Andrey Hristov
a047ece2e0 Disable a flag 2013-07-22 11:02:48 +02:00
Andrey Hristov
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
Andrey Hristov
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
Andrey Hristov
e78ca0b634 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-08 20:26:38 +02:00
Andrey Hristov
3dd5f4ae4c Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-07-08 20:24:58 +02:00
Andrey Hristov
9fc38183b7 Fixed segfault in mysqlnd when doing long prepare 2013-07-08 20:23:32 +02:00
Johannes Schlüter
9aa7343ae0 Merge branch 'PHP-5.4' into PHP-5.5 2013-07-03 17:10:58 +02:00
Johannes Schlüter
5bc7e597d9 Make sure return value is initialised in case transaction startup fails 2013-07-03 17:08:14 +02:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Andrey Hristov
378a5f9bfe updates 2013-05-21 13:27:45 +02:00
Johannes Schlüter
062519ed41 don't include smart_str.h in a too global header, fixes #64718 2013-04-30 14:26:55 +02:00