mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 12:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
80,714 Commits 500 Branches 1,381 Tags 813 MiB
a49ca6fde8
Commit Graph

80714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Timm Friebe
a49ca6fde8 Rewrite code to use ZEND_VM_JMP() instead of repeated ZEND_VM_INC_OPCODE() calls 2014-07-12 16:40:27 +02:00
Timm Friebe
a9653b613e Merge branch 'catchable-fatals/methods-on-non-objects' of github.com:thekid/php-src into catchable-fatals/methods-on-non-objects 2014-07-09 00:16:20 +02:00
Timm Friebe
671f02a262 Merge branch 'master' into catchable-fatals/methods-on-non-objects 2014-07-09 00:16:03 +02:00
Stanislav Malyshev
3119b884db Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
 2014-07-08 15:05:24 -07:00
Stanislav Malyshev
0ba74fccff update NEWS 2014-07-08 15:05:05 -07:00
Stanislav Malyshev
b19c30c1fa Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix unstable test
 2014-07-08 14:32:45 -07:00
Stanislav Malyshev
062f1482c3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix unstable test
 2014-07-08 14:32:27 -07:00
Stanislav Malyshev
f559976be6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix unstable test
 2014-07-08 14:31:40 -07:00
Stanislav Malyshev
64e4261c9b fix unstable test 2014-07-08 14:13:46 -07:00
Stanislav Malyshev
1632fbbd14 Merge branch 'pull-request/712' 
* pull-request/712:
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:55:53 -07:00
Stanislav Malyshev
ef2f12ec84 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67587: Redirection loop on nginx with FPM
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:55:35 -07:00
Stanislav Malyshev
35259e1d53 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:55:02 -07:00
Christian Weiske
e65e013e15 Fix bug #67587: Redirection loop on nginx with FPM 
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
 2014-07-08 12:54:57 -07:00
Stanislav Malyshev
5312c39cfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:54:20 -07:00
Christian Weiske
0bf50a8302 Fix bug #67587: Redirection loop on nginx with FPM 
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
 2014-07-08 12:53:45 -07:00
Christian Weiske
e76d3cba96 Fix bug #67587: Redirection loop on nginx with FPM 
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
 2014-07-08 19:03:26 +02:00
Anatol Belski
36644cc71e Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  updated NEWS
 2014-07-08 10:08:40 +02:00
Anatol Belski
b9ead7c67d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  updated NEWS
 2014-07-08 10:08:24 +02:00
Anatol Belski
0d80e6cba0 updated NEWS 2014-07-08 10:08:10 +02:00
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
5391c23511 Merge branch 'PHP-5.6' 
* PHP-5.6:
  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
 2014-07-08 09:57:56 +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
Anatol Belski
4883a60bb3 Merge branch 'pull-request/691' 2014-07-08 09:48:59 +02:00
Remi Collet
b26c97b1a2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  5.6 have fpm_globals.force_stderr
  Fix Bug #67530 	error_log=syslog ignored
 2014-07-08 08:34:15 +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
Sara Golemon
6e9bc95f67 Fix still broken session test. Only return true/false. 2014-07-07 14:30:28 -07:00
Adam Harvey
1a43eac259 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
 2014-07-07 20:49:00 +00: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
Sara Golemon
7c2489751c Followup fix to custom session save handlers 
2d9885c introduced some regressions.  This addresses those.

  * Don't throw return type notice or session write failure when in an exception
  * Fix tests to properly return true/false since null is no longer falsy/successy
  * Rerecord a few tests to accomodate difference in raised warnings
 2014-07-07 12:59:54 -07:00
Stanislav Malyshev
888fb3323e Merge branch 'PHP-5.6' 
* PHP-5.6:
  create locales and re-add test
 2014-07-07 10:42:36 -07: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
Timm Friebe
be957f806b Merge branch 'master' into catchable-fatals/methods-on-non-objects 2014-07-07 19:16:15 +02:00
Stanislav Malyshev
fc56aa6829 Merge branch 'PHP-5.6' 
* PHP-5.6:
  rm test for now
 2014-07-07 09:34:03 -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
f0499b86a8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  change locale - looks like not everybody has sl_SI
 2014-07-07 01:38:04 -07:00