Commit Graph

187 Commits

Author SHA1 Message Date
Julien Pauli
8ff4abb468 Merge branch 'PHP-5.6'
* PHP-5.6:
  pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:24:29 +01:00
Julien Pauli
3769aee67c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
2014-12-12 18:24:16 +01:00
Jille Timmermans
9beb3763db pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary 2014-12-12 18:16:12 +01:00
Julien Pauli
8779578354 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS
  Updated NEWS
  Fix #60509, pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:42:07 +01:00
Julien Pauli
736279239e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS
  Fix #60509, pcntl_signal doesn't decrease ref-count of old handler
2014-11-29 14:41:06 +01:00
Julien Pauli
19b5bc8ce2 Fix #60509, pcntl_signal doesn't decrease ref-count of old handler 2014-11-29 14:39:19 +01:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
2014-11-23 14:33:43 -08:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Nikita Popov
28e7beea66 Fix zend_longo_str 2014-08-25 22:47:04 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
7de2259818 fix zpp 2014-08-21 17:59:28 +02:00
Anatol Belski
1a5a113f95 ported pcntl 2014-08-19 19:08:41 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Nikita Popov
0987d19712 Use zend_long_to_str in pcntl 2014-05-28 18:26:11 +02:00
Dmitry Stogov
b675492054 Use new zend_hash API 2014-05-28 17:30:05 +04:00
Nikita Popov
8fbf4027e2 Remove incorrect EMPTY_SWITCH_DEFAULT_CASE() usage 2014-05-23 14:32:52 +02:00
Dmitry Stogov
70a5e0e429 Fixed support for references and proper string lengths 2014-05-06 15:03:25 +04:00
Dmitry Stogov
53b5de1e64 Added support for ext/pcntl (incomplete; ext/posix required to run all tests) 2014-05-06 14:23:56 +04: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
Kalle Sommer Nielsen
aed4b086ac Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01:00
Rasmus Lerdorf
9fa7e8932d Merge commit 'a03f094'
* commit 'a03f094':
  We shouldn't load any local ini files for these tests
2013-08-02 16:23:52 -04:00
Rasmus Lerdorf
f17f596b27 Merge commit 'a03f094' into PHP-5.5
* commit 'a03f094':
  We shouldn't load any local ini files for these tests
2013-08-02 16:23:44 -04:00
Rasmus Lerdorf
a03f0943ca We shouldn't load any local ini files for these tests 2013-08-02 16:23:18 -04:00
Veres Lajos
4749457a49 HASH_KEY_NON_EXISTANT fix 2013-07-21 20:09:53 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Gustavo André dos Santos Lopes
fc4482fd5e Merge branch '5.4' 2012-03-29 08:48:13 +01:00
Gustavo André dos Santos Lopes
f4873c68a6 Merge branch '5.3' into 5.4
Conflicts:
	main/output.c
2012-03-29 08:47:58 +01:00
Jille Timmermans
710335b2a3 ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 08:46:04 +01:00
Gustavo André dos Santos Lopes
616d802974 Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit 4aeabaf8e9.
2012-03-29 08:45:00 +01:00
Gustavo André dos Santos Lopes
117cdf384f Revert "ext/pcntl/pcntl.c: Fix typo in comment" (apply correct workflow)
This reverts commit 55b1e61242.
2012-03-29 08:44:19 +01:00
Gustavo André dos Santos Lopes
57af2875dc Revert "Merge branch 'pull-request/24'" (apply correct workflow)
This reverts commit a00b447b34, reversing
changes made to 48daddf093.
2012-03-29 08:41:51 +01:00
Jille Timmermans
4aeabaf8e9 ext/pcntl/pcntl.c: Fix typo in comment
Signed-off-by: Jille Timmermans <jille@quis.cx>
2012-03-29 09:07:19 +09:00