1
0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Commit Graph

3820 Commits

Author SHA1 Message Date
Anatol Belski f5b9d87fb9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:31:22 +02:00
Anatol Belski 29ac511b8a fix possible resource leak and make sure there's something to qsort() 2013-07-10 13:00:47 +02:00
Felipe Pena d01ca1342c Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 16:26:36 -03:00
Felipe Pena 6ba93a4bae - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana 2013-06-25 16:26:26 -03:00
David Soria Parra 83fc53acb9 Bump version 2013-06-19 22:11:52 +02:00
Stanislav Malyshev dda3f404ec 5.4.18 next 2013-06-18 22:58:11 -07:00
Matteo Beccati 6f594514b0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:55:12 +02:00
Matteo Beccati 02f552ceca Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:54:32 +02:00
Matteo Beccati 6238dd6f32 Fixed bug #63186 (compile failure on netbsd) 2013-06-14 16:51:54 +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
Johannes Schlüter 4cb25d25f1 This will be PHP 5.3.27 2013-05-22 17:13:17 +02:00
Stanislav Malyshev c53058763a 5.4.17 is next 2013-05-21 23:36:28 -07:00
Anatol Belski fda25c7ea6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #64853Use of no longer available ini directives causes crash on TS build
2013-05-16 08:43:07 +02:00
Anatol Belski d82704b677 Fixed bug #64853Use of no longer available ini directives causes crash on TS build
The fatal error for removed ini options is thrown before the executor
init, so ensure the relevant variables are initialized.
2013-05-16 08:40:56 +02:00
Johannes Schlüter 63434524f8 PHP 5.3.26 this will be 2013-04-25 18:02:53 +02:00
Stanislav Malyshev a58a279d7b 5.4.16-dev 2013-04-24 10:15:35 -07:00
Rasmus Lerdorf c3a57fff5e Fixed bugs #47675 and #64577 (fd leak on Solaris) 2013-04-04 19:23:22 -07:00
Rasmus Lerdorf 569eddce0f Fixed bugs #47675 and #64577 (fd leak on Solaris) 2013-04-04 19:22:28 -07:00
Rasmus Lerdorf 1b60c189ad Fixed bugs #47675 and #64577 (fd leak on Solaris) 2013-04-04 19:15:52 -07:00
Remi Collet 44dbe6a815 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  keep previous test to avoid any behavior change
2013-04-02 16:31:45 +02:00
Remi Collet 731a5c5104 keep previous test to avoid any behavior change 2013-04-02 16:31:36 +02:00
Remi Collet ce89bc8743 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix comment
  Fixed Bug #64565 copy doesn't report failure on partial copy
2013-04-02 16:24:14 +02:00
Remi Collet 8e8a75444c fix comment 2013-04-02 16:24:00 +02:00
Remi Collet 6b4148bc97 Fixed Bug #64565 copy doesn't report failure on partial copy
_php_stream_copy_to_stream_ex, when mmap is possible, doesn't check
if actually written bytes match read bytes.

Fix this (paranoid check) to be consistent with non mmap mode

Seems hard to add a unit test, as this rely on a full filesystem.
2013-04-02 16:18:26 +02:00
Johannes Schlüter 46ee57f2d7 This will PHP 5.3.25 2013-03-28 15:05:46 +01:00
Stanislav Malyshev f982aaafa7 will be 5.4.15 2013-03-27 14:00:12 -07:00
Pierre Joye d0aa831614 versions no longer supported, no need to check 2013-03-27 07:15:23 +01:00
David Soria Parra c542e969f2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix typos
2013-03-19 15:11:48 +01:00
Carson McDonald c6f6bf88d8 Fix typos 2013-03-19 15:11:34 +01:00
Dmitry Stogov 0b8b6a727d Added ability to load zend_extensions without absolute path names 2013-03-17 11:42:25 +04:00
Carson McDonald 0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Stanislav Malyshev 5c5bc7cf1b 5.4.24-dev 2013-02-28 21:25:36 -08:00
Stanislav Malyshev 8f533d2dfd 5.3.23RC1 2013-02-28 21:22:06 -08:00
Stanislav Malyshev 31a6f8b7f4 5.4.13 branched, now it's 5.4.14 2013-02-26 22:25:33 -08:00
Gustavo Lopes 608254fa57 Fix non-Windows build 2013-02-02 16:38:09 +01:00
Gustavo Lopes e8f0e863ae Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix wrong blocking state being set
  Fix tests (Windows)
  Remove a Windows only warning
  Move & improve PHP_SOCKET_ERROR def
  Move some declarations to sockets.c
  Fix overbroad skipif include
2013-02-02 15:32:03 +01:00
Gustavo Lopes 24e380f970 Remove a Windows only warning 2013-02-02 15:29:18 +01:00
Johannes Schlüter a80fdc47b3 This will be PHP 5.3.23 2013-01-31 00:57:29 +01:00
Stanislav Malyshev 09b6e33b40 branched 5.4.12 2013-01-29 12:33:45 -08:00
Stanislav Malyshev 748b37654d complete zts fix 2013-01-29 12:12:34 -08:00
Felipe Pena 37c304b5db - Fixed ZTS build 2013-01-29 09:26:54 -02:00
ALeX Kazik 475a644bd8 Implemented Feature #60524 (sys_temp_dir)
Added a new configuration directive which allows it to change the
temporary directory, the default behavior is unchanged.

This is a useful option if you use all/some hosts inside of one .ini file
with sections and want to change the temp dir per user (maybe it's not
allowed to write outside the users home directory). Since the TMPDIR
variable affects the whole php that way can not be used for this scenario.

(see https://bugs.php.net/bug.php?id=60524)
2013-01-28 22:37:43 -08:00
Stanislav Malyshev 581db9c5fa Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix missing parameter
2013-01-27 17:11:36 -08:00
Andras Elso 3e6d633a0d Fix missing parameter 2013-01-27 17:11:14 -08:00
Arnaud Le Blanc 718afb9acf Merge branch 'PHP-5.4' into PHP-5.5 2013-01-13 15:47:12 +01:00
Arnaud Le Blanc a06313fe5a fixed alternate form for 'x' and 'X' formats
same fix exists in original code:
https://svn.apache.org/viewvc?view=revision&revision=1152309
2013-01-13 15:45:15 +01:00
Stanislav Malyshev 5894aa0950 5.4.12-dev 2013-01-03 17:25:56 -08:00
Johannes Schlüter 712710bfec This will be PHP 5.3.22 2013-01-03 22:56:46 +01:00
Stanislav Malyshev 80a9a80a52 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
	main/main.c
2013-01-01 21:20:35 -08:00