Dmitry Stogov
b4c2bd2277
Fixed compilation on Windows
2014-07-15 15:50:42 +04:00
Dmitry Stogov
bcc677789c
Fixed ZTS build
2014-07-14 15:46:09 +04:00
Dmitry Stogov
af7cb16907
Implemented builtin instruction for strlen()
2014-07-14 15:43:11 +04:00
Dmitry Stogov
42c4bcaed1
Fixed ZTS build
2014-07-14 14:25:04 +04:00
Dmitry Stogov
32e477c98c
Merge branch 'master' into phpng
...
* master: (40 commits)
Bug #67609 : TLS connections fail behind HTTP proxy
Updated NEWS for #67594
Updated NEWS for #67594
Fix #67594 - invisible colon should be stripped off header name
Updated NEWS for 34407
Updated NEWS for 34407
Updated NEWS for 34407
Fix for bug #34407 - ucwords and title case
fixed broken merged code
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
fixed broken merged code
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Test output relies on expose_php being on
1.2 is a problematic float to print out Lower the default display precision for this test
The test output is dependent on expose_php ini
fix makefile in phpize mode
fixe output_as_table() when no ext was enabled
fix end of stream exception when generating makefile
...
Conflicts:
ext/standard/http_fopen_wrapper.c
ext/standard/string.c
sapi/cli/php_cli_server.c
2014-07-14 11:44:53 +04:00
Xinchen Hui
0ef6f729c9
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
2014-07-14 14:34:51 +08:00
Dmitry Stogov
7dfb4f6b38
Implemented builtin instruction for type check functions - is_*()
2014-07-14 10:33:11 +04:00
Xinchen Hui
b7ff8f28b2
Temporary fixed the invalid read warning
2014-07-14 14:01:53 +08:00
Daniel Lowrey
4bdb0120dc
Merge branch 'PHP-5.6'
2014-07-12 10:57:30 -04:00
Daniel Lowrey
f3bf887e6d
Bug #67609 : TLS connections fail behind HTTP proxy
2014-07-12 10:51:44 -04:00
Tjerk Meesters
3a9bdafeff
Merge branch 'PHP-5.6'
2014-07-12 15:11:18 +08:00
Tjerk Meesters
b3948b1d05
Updated NEWS for #67594
2014-07-12 15:11:05 +08:00
Tjerk Meesters
4e3d9a52ac
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-12 15:09:47 +08:00
Tjerk Meesters
7a5323778d
Updated NEWS for #67594
2014-07-12 15:09:32 +08:00
Tjerk Meesters
1684ba3c6f
Fix #67594 - invisible colon should be stripped off header name
2014-07-12 12:45:50 +08:00
Tjerk Meesters
7de82eaeef
Merge branch 'PHP-5.6'
2014-07-12 11:15:03 +08:00
Tjerk Meesters
c3f5e2a1f9
Updated NEWS for 34407
2014-07-12 11:14:18 +08:00
Tjerk Meesters
18feaf9416
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-12 11:10:15 +08:00
Tjerk Meesters
377750cd8f
Updated NEWS for 34407
2014-07-12 11:09:35 +08:00
Tjerk Meesters
8757e2cab8
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-12 11:08:50 +08:00
Tjerk Meesters
f25ff02b54
Updated NEWS for 34407
2014-07-12 11:07:06 +08:00
Tjerk Meesters
4fc0d46ae7
Fix for bug #34407 - ucwords and title case
...
Added support for ranges like trim() has
2014-07-12 10:44:11 +08:00
George Wang
e05fb6ee01
fixed broken merged code
2014-07-11 15:02:02 -04:00
George Wang
2d7625a1b8
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
2014-07-11 15:00:36 -04:00
George Wang
ca8c94c917
fixed broken merged code
2014-07-11 14:57:55 -04:00
George Wang
84373a69dc
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-07-11 14:40:54 -04:00
George Wang
a5f2b002b4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-07-11 14:39:03 -04:00
George Wang
79d8be35f9
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
2014-07-11 14:38:18 -04:00
George Wang
9f721967a3
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
2014-07-11 14:37:39 -04:00
George Wang
0baaf9fade
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
2014-07-11 14:31:59 -04:00
Rasmus Lerdorf
cf23a2efc5
Test output relies on expose_php being on
2014-07-11 10:59:02 -07:00
Rasmus Lerdorf
a6d27b80b3
1.2 is a problematic float to print out
...
Lower the default display precision for this test
2014-07-11 10:29:40 -07:00
Rasmus Lerdorf
e6fae4ca4f
The test output is dependent on expose_php ini
2014-07-11 09:12:32 -07:00
Dmitry Stogov
6c8db864e0
Implemented builtin instruction for strlen()
2014-07-11 18:52:27 +04:00
Anatol Belski
7eaac0f605
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix makefile in phpize mode
2014-07-11 15:07:39 +02:00
Anatol Belski
c79a6a0613
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix makefile in phpize mode
2014-07-11 15:07:22 +02:00
Anatol Belski
b10ed89dac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix makefile in phpize mode
2014-07-11 15:06:56 +02:00
Anatol Belski
ae313b6037
fix makefile in phpize mode
...
- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones
2014-07-11 15:05:01 +02:00
Dmitry Stogov
27f38798a1
Fast parameter parsing API
...
This API is experemental. It may be changed or removed.
It should be used only for really often used functions.
(Keep the original parsing code and wrap usage with #ifndef FAST_ZPP)
2014-07-11 16:32:20 +04:00
Dmitry Stogov
8f229b2855
Optimized array_map() and array_combine()
2014-07-11 12:28:36 +04:00
Anatol Belski
646f0f4e47
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixe output_as_table() when no ext was enabled
2014-07-11 09:38:59 +02:00
Anatol Belski
e0d6ed6b21
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixe output_as_table() when no ext was enabled
2014-07-11 09:38:44 +02:00
Anatol Belski
f3d565f6ac
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixe output_as_table() when no ext was enabled
2014-07-11 09:37:19 +02:00
Anatol Belski
9f5cf7d41a
fixe output_as_table() when no ext was enabled
2014-07-11 09:36:44 +02:00
Anatol Belski
efea4cc3e0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix end of stream exception when generating makefile
2014-07-10 22:35:41 +02:00
Anatol Belski
63abaa6d69
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix end of stream exception when generating makefile
2014-07-10 22:35:23 +02:00
Anatol Belski
efcc789ef8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix end of stream exception when generating makefile
2014-07-10 22:34:55 +02:00
Anatol Belski
02b661ecfc
fix end of stream exception when generating makefile
2014-07-10 22:33:55 +02:00
Dmitry Stogov
de306e7088
Implement call_user_func() and call_user_func_array() using special opcodes.
...
In some rare cases it leads to insignificant changes in error messages.
2014-07-11 00:32:18 +04:00
Anatol Belski
2f1c11b3e2
Merge branch 'PHP-5.6'
...
* PHP-5.6:
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
2014-07-10 22:17:46 +02:00
