php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-25 16:52:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,418 Commits 547 Branches 1,481 Tags
ec00a4de4e8db83c07afde9a182d43fe73d860c9
Commit Graph

600 Commits

Author SHA1 Message Date
Felipe Pena
a80ad10d9b - Fix merge 2015-02-16 12:21:20 -02:00
Antony Dovgal
c4664d1731 Merge branch 'pull-request/995' into PHP-5.6 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:15:11 +03:00
redfoxli
3664345aba fix bug #68822 (request time is reset too early) 
this caused wrong time in the logs
 2015-02-16 15:10:09 +03:00
Dmitry Stogov
e10e151e9b Merged zend_array and HashTable into the single data structure. 
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
 2015-02-13 22:20:39 +03:00
Xinchen Hui
e5d8a14239 Revert "Cleanup globals initialization" 
This reverts commit 309e90638d.
 2015-02-13 18:25:44 +08:00
Xinchen Hui
94dcddbc4a Revert "Remove useless TSRMLS by merge" 
This reverts commit 5e7fd50376.
 2015-02-13 18:25:31 +08:00
Xinchen Hui
5e7fd50376 Remove useless TSRMLS by merge 2015-02-13 11:02:37 +08:00
Xinchen Hui
309e90638d Cleanup globals initialization 2015-02-13 10:58:35 +08:00
Michael Wallner
c0477fbcb5 Squashed commit of the following: 
commit 5cee14b14b
Merge: 6392e1e 59593ba
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 19:15:48 2015 +0800

    Merge branch 'master' of git://github.com/php/php-src

commit 6392e1e86a
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 11:32:04 2015 +0800

    Remove duplicated line
 2015-01-30 23:01:26 +01:00
Xinchen Hui
88e13bda6a Fixed bug #68945 (Unknown admin values segfault pools) 2015-01-30 11:01:42 +08:00
Xinchen Hui
95142d9015 Merge branch 'PHP-5.6' 2015-01-27 22:25:55 +08:00
Xinchen Hui
b881de9937 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:25:45 +08:00
Xinchen Hui
4c5995b172 fcgi_write in fpm returns ssizt_t, but it returns int in cgi 2015-01-27 22:25:38 +08:00
Xinchen Hui
9fdf62d64a Merge branch 'PHP-5.6' 
Conflicts:
	sapi/cgi/cgi_main.c
 2015-01-27 22:15:12 +08:00
Xinchen Hui
6336fa18c4 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:13:04 +08:00
Xinchen Hui
8c2d91761a Also Fixed #68571 in CGI SAPI, and some cleanup 2015-01-27 22:11:23 +08:00
Xinchen Hui
6c87372199 Merge branch 'fixbug68571tophp5.5' of https://github.com/redfoxli/php-src into PHP-5.5 2015-01-27 22:04:23 +08:00
Nikita Popov
e05993dfa2 Remove dl() on fpm-fcgi 2015-01-26 21:00:23 +01:00
Rasmus Lerdorf
e242f871df Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:40:27 -08:00
Rasmus Lerdorf
295926855b Slightly modify and merge PR#105 from @MegaManSec 2015-01-21 11:39:23 -08:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Rasmus Lerdorf
50c721a623 These tests all assume that IPV6 is available. 2015-01-09 17:24:48 -08:00
Remi Collet
1b5e87862f Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup old unused typedef
 2015-01-06 11:07:10 +01:00
Remi Collet
0ba32e5cf9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  cleanup old unused typedef
 2015-01-06 11:06:53 +01:00
Remi Collet
8404f8ac2a cleanup old unused typedef 2015-01-06 11:06:25 +01:00
Remi Collet
e7cdf9df7c Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #68751 listen.allowed_clients is broken
 2015-01-05 17:36:26 +01:00
Remi Collet
eb1a1d5feb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug #68751 listen.allowed_clients is broken
 2015-01-05 17:35:14 +01:00
Remi Collet
1b6d076244 Fix bug #68751 listen.allowed_clients is broken 2015-01-05 17:33:57 +01:00
Xinchen Hui
28985e982b Still -1 on *BSD now 2015-01-04 22:08:35 -05:00
Xinchen Hui
80c0a02286 This is 511 now (ebf4ffc935) 2015-01-04 22:04:32 -05:00
Stanislav Malyshev
73d74ac54c Merge branch 'pull-request/731' 
* pull-request/731:
  Set FPM_BACKLOG_DEFAULT to 511
 2015-01-04 19:00:05 -08:00
Xinchen Hui
8cd8c2ccfb Fixed warning 2014-12-22 23:39:32 +08:00
Andrea Faulds
e20cbdbe97 Unify HTTP status code maps 2014-12-21 03:12:39 +00:00
Anatol Belski
a857f3a147 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Fix bug #67106 split main fpm config
  split fpm config to two parts. PR#903
  fix typo
  Fix undefined behaviour in strnatcmp
  Fix undefined behaviour in strnatcmp
  Fixed memory leak introduced by 73458e8f
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
 2014-12-14 19:44:24 +01:00
Elan Ruusamäe
9f189dd290 split fpm config to two parts. PR#903 
main config = global options
secondary config = pool options

makes easier to add new pools:
duplicate pool config in fpm.d dir

https://bugs.php.net/bug.php?id=67106
 2014-12-14 14:21:46 +01:00
Remi Collet
70c141b8f8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix typo
 2014-12-14 09:23:25 +01:00
Remi Collet
505adabf25 fix typo 2014-12-14 09:22:59 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
redfoxli
7953d830ab follow C89 format 2014-12-10 21:58:57 +08:00
Remi Collet
19d481945e Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix bug #68526 Implement POSIX Access Control List for UDS
 2014-12-10 08:19:29 +01:00
Remi Collet
744ada7d9d Fix bug #68526 Implement POSIX Access Control List for UDS 
- add --with-fpm-acl build option which allow to manage ACL
on Unix Domain Socket
- add listen.acl_users pool option
- add listen.acl_groups pool option

Keep old behavior (chmod) if option not used or not supported.
 2014-12-10 08:15:21 +01:00
redfoxli
d0a58695d0 fix-bug-68571-to-php5.5 2014-12-09 19:42:55 +08:00
Remi Collet
4ba828652b Merge branch 'PHP-5.6' 
* PHP-5.6:
  XFAIL as catch_workers_output = yes seems not reliable
 2014-12-01 07:29:19 +01:00
Remi Collet
cb1a297bf4 XFAIL as catch_workers_output = yes seems not reliable 2014-12-01 07:28:49 +01:00
Remi Collet
bfa9c4609d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Move chown to fpm_unix_set_socket_premissions()
 2014-11-29 16:52:25 +01:00
Remi Collet
e1d4ac426c Move chown to fpm_unix_set_socket_premissions() 
For consistency, with fpm_unix_resolve_socket_premissions.
Compute + Use in the same source file.
To make easier future enhancement.

Also check chdir output to fix a build warning.
 2014-11-29 16:49:08 +01:00