1
0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Commit Graph

1068 Commits

Author SHA1 Message Date
Anatol Belski 7a71f5d112 updated libs versions 2014-04-08 11:42:58 +02:00
Anatol Belski 972c451c73 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update lib versions

Conflicts:
	win32/build/libs_version.txt
2014-03-27 18:19:24 +01:00
Anatol Belski 1283722589 update lib versions 2014-03-27 18:18:06 +01:00
Anatol Belski 7477f5b387 fix disabling PGO for extensions, rel bug #65715 2014-03-25 06:44:54 +01:00
Anatol Belski 223f7d9a44 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  more fixes related to bug #65715
2014-03-24 19:18:39 +01:00
Anatol Belski 6612e1ba6a more fixes related to bug #65715 2014-03-24 19:15:02 +01:00
Anatol Belski 76066b304c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:28:48 +01:00
Anatol Belski 17a57ad980 Fixed bug #65715 php5embed.lib isn't provided anymore 2014-03-24 10:24:37 +01:00
Anatol Belski f7b9c12ed9 updated libs_version.txt 2014-03-13 10:28:04 +01:00
Pierre Joye d2e42d5372 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
	win32/build/confutils.js
2014-03-10 12:10:57 +01:00
Pierre Joye b084157d3d Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
# By Anatol Belski (38) and others
# Via Anatol Belski (23) and others
* 'PHP-5.5' of git.php.net:php-src: (325 commits)
  NEWS
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
  Improves fix for memory leak, keep in sync with upstream.
  Fixed news for #60602
  Updated news for #60602
  proc_open(): separate environment values that aren't strings
  Fixed NEWS.
  Updated news for #66535 and #66109
  Updated NEWS for #66535
  don't compare constants on run time
  substr_compare(): Allow zero length comparison
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  typo spotted by Lajos Veres
  update libs_version.txt
  ...
2014-03-05 10:37:04 +01:00
Pierre Joye e590aceb5a Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
# By Anatol Belski (22) and others
# Via Derick Rethans (5) and others
* 'PHP-5.4' of git.php.net:php-src: (176 commits)
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
  Improves fix for memory leak, keep in sync with upstream.
  Updated news for #60602
  proc_open(): separate environment values that aren't strings
  Updated NEWS for #66535
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
  fix tests broken by 633f898f15
  add news entry
  add clear_env option to FPM config
  Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
  fixed macro
  Make sure value is initialized
  ...
2014-03-05 10:32:42 +01:00
Anatol Belski ccd4bf5147 update libs_version.txt 2014-02-27 09:23:48 +01:00
Anatol Belski e41059c633 update libs_version.txt 2014-02-06 09:13:05 +01:00
Anatol Belski 6267c40ac5 updated libs_version.txt 2014-02-06 09:14:30 +01:00
Anatol Belski e67ef24227 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixed missing usleep() prototype in pgsql
2014-01-22 11:53:32 +01:00
Anatol Belski 7bcf01f39a fixed missing usleep() prototype in pgsql 2014-01-22 11:52:52 +01:00
Xinchen Hui 47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Bob Weinand 7e3af096b3 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	Zend/zend_vm_opcodes.c
2013-12-22 00:54:59 +01:00
Bob Weinand 97bf254385 Included new .c file in build too 2013-12-22 00:52:05 +01:00
Pierre Joye fb3e21fbcc add vc12 (2013) 2013-11-04 22:25:50 +01:00
Pierre Joye 9b54901ffb add vc12 (2013) 2013-11-04 22:19:02 +01:00
Anatol Belski 5f1cbfacf9 updated libs_versions.txt 2013-10-29 13:35:02 +01:00
Felipe Pena 62a8305007 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible memory leak
2013-10-12 18:06:27 -03:00
Felipe Pena 960b4e81f3 - Fixed possible memory leak 2013-10-12 18:06:20 -03:00
Anatol Belski bd677b43a7 removed the /Wp64 switch as we use true 64 bit compiler now 2013-08-28 15:10:05 +02:00
Anatol Belski 3745bdadc0 updated lib versions 2013-08-28 14:43:00 +02:00
Anatol Belski 51016262a7 updated lib versions, the vc11 ones only matter now 2013-08-28 14:25:39 +02:00
Anatol Belski 99afc6dc11 Fixed bug #65268 select() implementation uses outdated tick API 2013-07-18 18:01:51 +02:00
Bruno CHALOPIN 2ec7b1c388 Remove PWS (Personal Web Server) references 2013-07-15 00:38:29 -07:00
Veres Lajos e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos 72085b0e5f typo fixes 2013-07-15 00:18:57 -07: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
Stanislav Malyshev 84e35fb2e0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Anatol Belski e3aeb6c070 updated lib versions 2013-05-01 21:37:28 +02:00
Anatol Belski 8febe2ad08 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed stream_socket_pair() on Windows x64 and
2013-04-22 18:59:11 +02:00
Anatol Belski f082d6311b Fixed stream_socket_pair() on Windows x64 and
improved errorhandling in the socketpair() implementation.
2013-04-22 18:55:32 +02:00
Anatol Belski f578bb0388 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
2013-04-22 19:00:13 +02:00
Anatol Belski ca425a67c4 updated lib versions 2013-04-17 13:20:23 +02:00
Anatol Belski fb955a613c updated lib versions 2013-04-17 13:17:32 +02:00
Anatol Belski 4fbe1173eb fixed EOL 2013-04-17 13:15:08 +02:00
Anatol Belski 323fdb9879 updated lib versions 2013-04-17 13:12:18 +02:00
Anatol Belski 2e00f7611c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed possible precision loss in microtime
2013-03-23 17:48:05 +01:00
Anatol Belski 3654ff7366 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed possible precision loss in microtime
2013-03-23 17:47:39 +01:00
Anatol Belski b022e54bd1 Fixed possible precision loss in microtime
This is related to the fix for bug #64370. MSVC natively supports __int64 type,
so calculating with 32 bit ints is neither necessary nor reliable. Therefore
an older piece of code is reused.
2013-03-23 17:40:06 +01:00
Anatol Belski 90c8f16c3b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Backported patch for #64370
2013-03-15 19:08:32 +01:00
Anatol Belski b903d2d6cd Backported patch for #64370 2013-03-15 19:04:40 +01:00