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
78,983 Commits 549 Branches 1,486 Tags
ddd855cbc2d126e5ef8ecba0103b97e23d53128f
Commit Graph

3111 Commits

Author SHA1 Message Date
Remi Collet 0821d3942e Merge branch 'PHP-5.6' 
* PHP-5.6:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:38 +01:00
Remi Collet 06feb15a16 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:26 +01:00
Remi Collet 5fc7382a57 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
 2014-02-28 08:12:16 +01:00
Remi Collet b1df743b7a man page: long option name is --strip, not --stripped 2014-02-28 08:12:03 +01:00
Remi Collet c73b0543f1 --global have be removed in 5.2 2014-02-28 08:10:01 +01:00
Paul Annesley eb6941e902 add clear_env option to FPM config 
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
 2014-02-25 12:12:09 +04:00
Paul Annesley 6e15afd1be add clear_env option to FPM config 
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
 2014-02-25 12:06:32 +04:00
Paul Annesley a97ae8bc06 add clear_env option to FPM config 
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
 2014-02-24 11:53:40 +04:00
Paul Annesley a16304f836 add clear_env option to FPM config 
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
 2014-02-24 11:47:44 +04:00
Lior Kaplan 464b1bc4fb Merge branch 'PHP-5.6' 2014-02-14 17:19:33 +02:00
Veres Lajos a7ec000f35 a few typofixes 2014-02-14 17:16:17 +02:00
Yasuo Ohgaki 9a5cb51ebc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding
 2014-02-13 11:56:54 +09:00
Yasuo Ohgaki cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
krakjoe 148d7cc103 windows 2014-02-02 15:14:25 +00:00
krakjoe 407d761d09 clean symbols 2014-02-02 15:10:17 +00:00
krakjoe e8519bc207 another patch from upstream 2014-02-02 14:58:39 +00:00
krakjoe 6a6bec44ad woops 2014-02-02 14:50:32 +00:00
krakjoe 9e84124e2d better use of tmpnam/mkstemp 2014-02-02 14:42:31 +00:00
krakjoe 4a96a75c7d update version 2014-02-02 14:04:47 +00:00
krakjoe a58c74f1c7 remove use of zend directly, avoid leaks/bugs in modules etc 2014-02-02 13:43:43 +00:00
krakjoe 6597d86389 Merge branch 'PHP-5.6' 
* PHP-5.6:
  windows
 2014-02-02 15:14:53 +00:00
krakjoe eacab735e0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  clean symbols
 2014-02-02 15:10:28 +00:00
krakjoe 8aaec7d1c3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  another patch from upstream
 2014-02-02 14:59:30 +00:00
krakjoe 202dcc0f6a Merge branch 'PHP-5.6' 
* PHP-5.6:
  woops
 2014-02-02 14:50:43 +00:00
krakjoe ee42849f8f Merge branch 'PHP-5.6' 
* PHP-5.6:
  better use of tmpnam/mkstemp
 2014-02-02 14:42:54 +00:00
krakjoe 37f4f132fc Merge branch 'PHP-5.6' 
* PHP-5.6:
  update version
 2014-02-02 14:05:03 +00:00
krakjoe 4c6816ddf2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  remove use of zend directly, avoid leaks/bugs in modules etc
 2014-02-02 13:51:05 +00:00
Anatol Belski d788a85736 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix C89 compat
 2014-01-19 02:05:38 +01:00
Anatol Belski 12c1cfbf8f fix C89 compat 2014-01-19 02:05:10 +01:00
Johannes Schlüter 84efb8fc71 Merge branch 'PHP-5.6' 2014-01-18 13:53:15 +01:00
Johannes Schlüter 8ff4d61f08 Merge branch 'phpdbg' into PHP-5.6 2014-01-18 13:52:27 +01:00
Antony Dovgal 98e6c8ca2d fix indentation 2014-01-17 12:49:21 +04:00
Gernot Vormayr dff0d51243 Add some basic and apparmor tests to fpm 2014-01-17 12:49:07 +04:00
Gernot Vormayr e3d3283405 Add --force-stderr to fpm 2014-01-17 12:49:00 +04:00
Gernot Vormayr f6d137a716 Add apparmor change hat functionality to fpm 2014-01-17 12:48:33 +04:00
Antony Dovgal a053e69991 fix indentation 2014-01-17 12:22:07 +04:00
Antony Dovgal 998f506b6d Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src 
* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm
 2014-01-16 17:36:03 +04:00
Gernot Vormayr e9883779a0 Add some basic and apparmor tests to fpm 2014-01-07 00:21:24 +01:00
Gernot Vormayr 32d9409a24 Add --force-stderr to fpm 2014-01-07 00:19:01 +01:00
Xinchen Hui 0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui 47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
krakjoe 50f09d8256 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update version output
 2013-12-27 18:04:06 +00:00
krakjoe c8dedaf2dc update version output 2013-12-27 18:03:11 +00:00
Xinchen Hui fb4678f1ac Merge branch 'PHP-5.6' 2013-12-27 20:46:08 +08:00
Xinchen Hui a8cd9b417c Fixed bug #66358 (fpm starts segfault) 2013-12-27 20:45:43 +08:00
Anatol Belski c676f5b36d Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix c89 compat
 2013-12-25 23:44:24 +01:00
Anatol Belski 1e411ebdf5 fix c89 compat 2013-12-25 23:43:20 +01:00
Anatol Belski 3af0ee0ea3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed incompatible pointer in phpdbg on win64
 2013-12-24 21:09:45 +01:00