clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,916 Commits 494 Branches 1,367 Tags 801 MiB
858c076810
Commit Graph

79916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Wang
caceba5973 Do not kill children process in pre-fork mode when parent process quit. 2014-07-10 15:33:48 -04:00
George Wang
ee0c8f8d6f update to LSAPI 6.6 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2014-07-10 15:33:14 -04:00
George Wang
0285720570 Update LiteSpeed SAPI code to V6.4 
Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapidef.h
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h
 2014-07-10 15:32:51 -04:00
George Wang
e7f36ba693 cleanup file headers. 2014-07-10 15:14:30 -04:00
George Wang
01a1c3067c Do not kill children process in pre-fork mode when parent process quit. 2014-07-10 15:14:06 -04:00
George Wang
1f46bec9ce update to LSAPI 6.6 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2014-07-10 14:46:43 -04:00
George Wang
e3df0c5f60 Update LiteSpeed SAPI code to V6.4 
Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapidef.h
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h
 2014-07-10 14:42:05 -04:00
George Wang
232661bf88 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-07-10 14:14:38 -04:00
George Wang
72e14bfb40 update year & copyright 2014-07-10 14:14:11 -04:00
Anatol Belski
71f4b1e4d9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
  Fixed typo in Makefile.frag
 2014-07-10 19:37:12 +02:00
Anatol Belski
ec6b367722 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
 2014-07-10 19:36:04 +02:00
Anatol Belski
e2b0d97950 turn off PGO in phpize mode 2014-07-10 19:35:26 +02:00
George Wang
eb7bf5d30a Fixed typo in Makefile.frag 2014-07-10 12:22:56 -04:00
George Wang
a34288fa1a Fixed typo in Makefile.frag 2014-07-10 12:21:23 -04:00
Anatol Belski
a8076b9312 explicitly PHP_ANALYZER=no when no known keyword was passed 2014-07-10 15:20:34 +02:00
Stanislav Malyshev
f0f6d24bc8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.31
  fix unstable test
  5.5.16 now
 2014-07-08 21:42:20 -07:00
Stanislav Malyshev
393bf0e4bb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.31
  fix unstable test

Conflicts:
	configure.in
	main/php_version.h
 2014-07-08 21:41:06 -07:00
Stanislav Malyshev
b93ea59665 5.4.31 2014-07-08 21:26:39 -07:00
Stanislav Malyshev
0ba74fccff update NEWS 2014-07-08 15:05:05 -07:00
Stanislav Malyshev
cd1130751d fix unstable test 2014-07-08 15:04:09 -07:00
Julien Pauli
0211185548 5.5.16 now 2014-07-08 23:54:19 +02: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
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
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
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