php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,931 Commits 549 Branches 1,486 Tags
5678ada68ed5bcf8908da99bfcbd24b05ac6fcc2
Commit Graph

3804 Commits

Author SHA1 Message Date
Pierre Joye 5466035621 Merge branch 'PHP-5.5' 
* PHP-5.5:
  versions no longer supported, no need to check
 2013-03-27 07:15:30 +01:00
Pierre Joye d0aa831614 versions no longer supported, no need to check 2013-03-27 07:15:23 +01:00
David Soria Parra d90a85c3bd Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix typos
 2013-03-19 15:11:56 +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 0def1ca59a Merge branch 'PHP-5.5' 
* PHP-5.5:
  Added ability to load zend_extensions without absolute path names
 2013-03-17 11:43:45 +04:00
Dmitry Stogov 0b8b6a727d Added ability to load zend_extensions without absolute path names 2013-03-17 11:42:25 +04:00
David Soria Parra 3adb1aa89e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Typo fix: recieved to received
 2013-03-07 23:05:14 +01:00
Carson McDonald 0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Carson McDonald 58f3c74e13 Fix a couple typos 2013-03-03 10:44:46 -05:00
Stanislav Malyshev 31a6f8b7f4 5.4.13 branched, now it's 5.4.14 2013-02-26 22:25:33 -08:00
Gustavo Lopes da0012dc26 Merge branch 'PHP-5.5' 
* PHP-5.5: (40 commits)
  php_strerror in ext/sockets renamed in 5.5
  Move macro back to .c file
  Fix multicast.c not defining errno on Windows
  Fix non-Windows build
  send/recvmsg() support for Windows
  Remove some pre-vista code
  Revert "Payload of HOPLIMIT/TCLASS are 8-bit"
  Ensure memory is initialized
  Payload of HOPLIMIT/TCLASS are 8-bit
  Fix buf in string -> int conv.
  Build fixes; accept names for if_index
  Refactoring: move stuff to new conversions.c
  Support sticky IPV6_PKTINFO
  Rename some functions for consistency
  Destroy ancillary registry on shutdown
  Move some multicast stuff to multicast.c
  Fix mcast_ipv6_send test
  Check return of fstat()
  Fix build on Mac OS X
  Register extra MSG_* constants
  ...
 2013-02-02 18:42:01 +01: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
Stanislav Malyshev 09b6e33b40 branched 5.4.12 2013-01-29 12:33:45 -08:00
Stanislav Malyshev 861c16d656 Merge branch 'PHP-5.5' 
* PHP-5.5:
  complete zts fix
 2013-01-29 12:12:58 -08:00
Stanislav Malyshev 748b37654d complete zts fix 2013-01-29 12:12:34 -08:00
Felipe Pena 9307126fe5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed ZTS build
 2013-01-29 09:27:09 -02:00
Felipe Pena 37c304b5db - Fixed ZTS build 2013-01-29 09:26:54 -02:00
Stanislav Malyshev 992bba6aef Merge branch 'PHP-5.5' 
* PHP-5.5:
  Add news for bug #60524
  Implemented Feature #60524 (sys_temp_dir)

Conflicts:
	UPGRADING
 2013-01-28 22:56:51 -08: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 ebc80d62ec Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix missing parameter
 2013-01-27 17:11:53 -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 bbf1c9c4a7 Merge branch 'PHP-5.5' 2013-01-13 15:47:33 +01: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
Stanislav Malyshev 6da86acfae Merge branch 'PHP-5.5' 
* PHP-5.5:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS
 2013-01-01 21:21:42 -08: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
Stanislav Malyshev 36e19c9cab Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. 
Without this fix, a webpage using eval() may return code 500.  That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
 2013-01-01 21:18:59 -08:00
Xinchen Hui 642721b38a Merge branch 'PHP-5.5' 2013-01-01 16:39:03 +08:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Rasmus Lerdorf d417a054e1 Merge branch 'PHP-5.5' 2012-12-19 23:01:00 -05:00
Rasmus Lerdorf d5fe89670e Merge branch 'PHP-5.4' into PHP-5.5 2012-12-19 23:00:41 -05:00
Rasmus Lerdorf 180b9e150b Fix for bug #63811 2012-12-19 22:58:18 -05:00
Dmitry Stogov 20113b5640 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
 2012-12-13 13:41:04 +04:00
Dmitry Stogov 4b1b115633 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)

Conflicts:
	NEWS
 2012-12-13 13:40:42 +04:00
Dmitry Stogov 35f86d24d8 Fixed bug #63757 (getenv() produces memory leak with CGI SAPI) 2012-12-13 13:39:42 +04:00
Stanislav Malyshev c3b6f6feed 5.4.11-dev 2012-12-04 21:30:50 -08:00
Xinchen Hui 093d119597 Merge branch 'PHP-5.4' into PHP-5.5 2012-11-30 14:30:37 +08:00
Michael Wallner 178e9919b2 Merge branch 'PHP-5.4' 2012-11-28 10:24:42 +01:00
Michael Wallner 575790e842 fix bug #61272 ob_start callback get passed empty string 2012-11-28 10:19:44 +01:00
Stanislav Malyshev 7262bf67a2 5.4.10-dev 2012-11-24 16:24:05 -08:00
David Soria Parra 2e6a4a286e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Bump API versions
 2012-11-13 20:58:51 +01:00
David Soria Parra ad4a87f798 Bump API versions 2012-11-13 20:57:34 +01:00
David Soria Parra d71577d2df Bump version to 5.6.0 2012-11-13 20:43:08 +01:00
David Soria Parra 012519839a Bump version to 5.5.99 and reset NEWS 2012-11-13 17:42:01 +01:00