clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,886 Commits 494 Branches 1,367 Tags 802 MiB
bad5502ca9
Commit Graph

79886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
5cf0084a92 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
 2014-07-08 10:07:31 +02:00
Anatol Belski
857cd18cf4 updated NEWS 2014-07-08 10:07:18 +02:00
Anatol Belski
d472434ea0 updated NEWS 2014-07-08 10:06:35 +02:00
Anatol Belski
8b3cc726be Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  NEWS
  Fix Bug #67530 	error_log=syslog ignored

Conflicts:
	sapi/fpm/fpm/fpm_stdio.c
 2014-07-08 09:57:36 +02:00
Anatol Belski
51f79846bf Backported the patch from bug #67407 into 5.5+ 2014-07-08 09:54:36 +02:00
Anatol Belski
e715038920 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Backported the patch from bug #67407 into 5.4
 2014-07-08 09:54:12 +02:00
Anatol Belski
03214a2aef Backported the patch from bug #67407 into 5.4 2014-07-08 09:52:35 +02:00
Remi Collet
208ae5498d NEWS 2014-07-08 08:33:48 +02:00
Remi Collet
71a27605f4 5.6 have fpm_globals.force_stderr 2014-07-08 08:33:48 +02:00
Remi Collet
60fd4d445c Fix Bug #67530 error_log=syslog ignored 
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
 2014-07-08 08:33:47 +02:00
Remi Collet
7b6757d99a NEWS 2014-07-08 08:31:15 +02:00
Remi Collet
0c840ced7c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fix Bug #67530 	error_log=syslog ignored
 2014-07-08 08:30:44 +02:00
Remi Collet
494034901e NEWS 2014-07-08 08:30:15 +02:00
Remi Collet
f8acf826c3 Fix Bug #67530 error_log=syslog ignored 
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
 2014-07-08 08:29:24 +02:00
Adam Harvey
70e9d3e2f9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
 2014-07-07 20:45:01 +00:00
Adam Harvey
1939b34c78 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
 2014-07-07 20:40:47 +00:00
Adam Harvey
604de67b7d Fixed bug #66830 (Empty header causes PHP built-in web server to hang). 
We had an infinite loop in sapi_cli_server_send_headers(): while iterating over
the linked list of headers, when an empty header was hit, continue would go to
the next iteration of the loop without updating h to be the next value in the
linked list. Updating it to always increment regardless of whether the header
is actually valid or not fixes the issue.
 2014-07-07 20:36:06 +00:00
Stanislav Malyshev
41448bff7c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  create locales and re-add test

Conflicts:
	.travis.yml
 2014-07-07 10:42:13 -07:00
Stanislav Malyshev
5516963633 create locales and re-add test 2014-07-07 10:34:43 -07:00
Stanislav Malyshev
31b395ac68 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  rm test for now
 2014-07-07 09:33:05 -07:00
Stanislav Malyshev
0e1599afe0 rm test for now 2014-07-07 09:32:26 -07:00
Stanislav Malyshev
432bb7abe5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  change locale - looks like not everybody has sl_SI
 2014-07-07 01:36:24 -07:00
Stanislav Malyshev
c402956178 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  change locale - looks like not everybody has sl_SI
 2014-07-07 01:36:03 -07:00
Stanislav Malyshev
a7d1cad4c3 change locale - looks like not everybody has sl_SI 2014-07-07 01:35:25 -07:00
Stanislav Malyshev
04a227dd16 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
 2014-07-07 00:50:07 -07:00
Stanislav Malyshev
96c9cc315d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix format
 2014-07-07 00:49:15 -07:00
Stanislav Malyshev
8ba240a70b Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone 2014-07-07 00:48:44 -07:00
Stanislav Malyshev
897b7b68cc fix format 2014-07-07 00:48:32 -07:00
Stanislav Malyshev
effb2b7a13 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
 2014-07-07 00:38:38 -07:00
Stanislav Malyshev
8ddf9a2dc4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
 2014-07-07 00:37:59 -07:00
Stanislav Malyshev
6c8a570a96 Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting) 2014-07-07 00:36:57 -07:00
Stanislav Malyshev
c291033469 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
 2014-07-06 22:15:35 -07:00
Lior Kaplan
716d2a3937 Make sure the generator script also creates a newline at the end of file 
Similar to commit d6713f39 in master
 2014-07-06 22:15:09 -07:00
Lior Kaplan
c5fec9e09d Add newline at end of file to prevent compilation warning 
The newline was removed at commit 50d50c2f
 2014-07-06 22:15:00 -07:00
Bob Weinand
0378b4caac Reference bug report instead of github issue in NEWS file 2014-07-06 13:34:03 +02:00
Stanislav Malyshev
7bb86f8a6b add more exts for Travis 2014-07-05 19:59:26 -07:00
Bob Weinand
715aea43e4 Update NEWS 2014-07-06 01:20:46 +02:00
Bob Weinand
17658fa7b8 Merge sapi/phpdbg into PHP-5.6 2014-07-06 01:17:50 +02:00
Bob Weinand
ba65286fa4 Merge pull request #104 from andytson/feature/rpm-build-fix 
Fix phpdbg.1 man page installation when build != src directory
 2014-07-06 01:16:03 +02:00
Andy Thompson
07d2272297 Fix phpdbg.1 man page installation when build != src directory 2014-07-05 13:05:05 +01:00
Michael Wallner
88c1ce3203 BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir) 2014-07-03 20:40:41 +02:00
Michael Wallner
155b5d1725 reorder 2014-07-03 20:40:41 +02:00
Michael Wallner
deee0011e1 restore API compatibility 2014-07-03 20:40:41 +02:00
Michael Wallner
438b6c5258 finish 2014-07-03 20:40:40 +02:00
Michael Wallner
40bcd909d8 refactor php_stream_temp_create{,_ex} and use it for the php://input stream 2014-07-03 20:40:40 +02:00
Michael Wallner
11e401ab59 refactor _php_stream_fopen_{temporary_,tmp}file() 2014-07-03 20:40:40 +02:00
Michael Wallner
04c6a5b377 fix length overflow of HTTP_RAW_POST_DATA 2014-07-03 20:40:40 +02:00
Xinchen Hui
989cdabe25 Update NEWS 2014-07-03 14:59:14 +08:00
Xinchen Hui
4e16054b7a Merge branch 'PHP-5.5' into PHP-5.6 2014-07-03 14:58:53 +08:00
Xinchen Hui
2034ace052 Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen) 2014-07-03 14:58:37 +08:00