Xinchen Hui
fb825a95d0
Fixed module name printing
2014-02-28 13:02:28 +08:00
Xinchen Hui
c1c4d26817
Use better data structures (incomplete)
2014-02-19 17:58:39 +08:00
Dmitry Stogov
bb58ea348c
Use better data structures (incomplete)
2014-02-18 18:10:54 +04:00
Dmitry Stogov
9ddf3c5780
Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2
2014-02-18 16:28:26 +04:00
Dmitry Stogov
5de7115679
Use better data structures (incomplete; able to run bench.php)
2014-02-18 16:27:38 +04:00
Xinchen Hui
43b03c74b3
Refacting smart_str
2014-02-18 17:42:46 +08:00
Xinchen Hui
50927142f3
Use better data structures (incomplete)
2014-02-17 15:41:02 +08:00
Xinchen Hui
028bdea3db
Use better data structures (incomplete)
2014-02-17 15:17:53 +08:00
Xinchen Hui
ab2a73a662
Use better data structures (incomplete)
2014-02-17 11:05:48 +08:00
Dmitry Stogov
e85790a4d4
Use better data structures (incomplete)
2014-02-14 15:11:21 +04:00
Dmitry Stogov
a52817eb02
Use better data structures (incomplete)
2014-02-14 14:11:52 +04:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04: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
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
Anatol Belski
00c7b973bb
fixed incompatible pointer in phpdbg on win64
2013-12-24 21:08:33 +01:00
Bob Weinand
c02acf3c29
Merge branch 'PHP-5.6'
2013-12-24 13:20:12 +01:00
Bob Weinand
ddf733fa69
Fixed #18
...
Errors not displaying in some configurations
2013-12-24 13:19:18 +01:00
Bob Weinand
ad358593a8
Merge branch 'PHP-5.6'
2013-12-24 00:37:20 +01:00
Bob Weinand
ca882858f4
Fixed credits in phpdbg.* files
2013-12-24 00:34:23 +01:00
Bob Weinand
0577ccad28
Added breaking upon fatal-ish error
2013-12-24 00:30:37 +01:00
Joe Watkins
617aefbcda
credits file for phpdbg
2013-12-24 00:16:47 +01:00
Joe Watkins
056f6fd895
Merge branch 'PHP-5.6'
...
* PHP-5.6:
credits file for phpdbg
2013-12-23 22:37:36 +00:00
Joe Watkins
265fdd9139
credits file for phpdbg
2013-12-23 22:36:30 +00:00
Bob Weinand
f500be8838
Merge branch 'PHP-5.6'
2013-12-20 14:35:40 +01:00
Bob Weinand
cee72c13d7
Merge branch 'master' of sapi/phpdbg into PHP-5.6
...
Including phpdbg.
2013-12-20 14:27:51 +01:00
Felipe Pena
a8a36b7d52
- Fixed build
2013-12-18 08:28:44 -02:00
Kalle Sommer Nielsen
d02340bb39
Kill a TSRMLS_FETCH() call in sapi/caudium
2013-12-18 09:11:15 +01:00
Kalle Sommer Nielsen
f883d3cc7a
We might as well re-use the TSRMLS parameters here as they are available in PHP_FUNCTION anyway to save a TSRMLS_FETCH() call
2013-12-18 09:10:45 +01:00
Kalle Sommer Nielsen
ed5a8d510f
Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs
2013-12-18 09:06:39 +01:00
Kalle Sommer Nielsen
f70f89c1b1
Kill another TSRMLS_FECH() in sapi/roxen
2013-12-18 09:05:01 +01:00
Kalle Sommer Nielsen
520d969fea
Fix these SAPI hooks so that the TSRMLS parameters are correctly passed as required by the sapi struct
...
# Not sure if this builds either
2013-12-18 09:01:44 +01:00