Anatol Belski
833e466983
Merge branch 'PHP-5.6'
...
* PHP-5.6:
force atoll macro usage on windows
2014-07-21 10:01:48 +02:00
Anatol Belski
f6d941e4b4
force atoll macro usage on windows
2014-07-21 09:52:52 +02:00
Lior Kaplan
46dcd12d53
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Enable build without atoll (e.g old AIX flavours)
Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:11:33 +03:00
Lior Kaplan
84673485f5
Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:10:08 +03:00
Michael Wallner
f9fda21667
Merge branch 'PHP-5.6'
...
* PHP-5.6:
BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
reorder
restore API compatibility
finish
refactor php_stream_temp_create{,_ex} and use it for the php://input stream
refactor _php_stream_fopen_{temporary_,tmp}file()
fix length overflow of HTTP_RAW_POST_DATA
Conflicts:
main/php_content_types.c
2014-07-03 20:43:12 +02:00
Michael Wallner
deee0011e1
restore API compatibility
2014-07-03 20:40:41 +02:00
Michael Wallner
438b6c5258
finish
2014-07-03 20:40:40 +02:00
Michael Wallner
40bcd909d8
refactor php_stream_temp_create{,_ex} and use it for the php://input stream
2014-07-03 20:40:40 +02:00
Michael Wallner
11e401ab59
refactor _php_stream_fopen_{temporary_,tmp}file()
2014-07-03 20:40:40 +02:00
Michael Wallner
04c6a5b377
fix length overflow of HTTP_RAW_POST_DATA
2014-07-03 20:40:40 +02:00
Adam Harvey
a92e3eb0fe
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Keep 308-399 HTTP response codes when header('Location:') is called.
2014-06-12 17:42:29 -07:00
Adam Harvey
82231b5d89
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Keep 308-399 HTTP response codes when header('Location:') is called.
2014-06-12 17:40:51 -07:00
Adam Harvey
aa3a5f7681
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Keep 308-399 HTTP response codes when header('Location:') is called.
2014-06-12 17:38:52 -07:00
Adam Harvey
1b9cbab9a7
Keep 308-399 HTTP response codes when header('Location:') is called.
...
Fixes bug #67428 (header('Location: foo') will override a 308-399 response
code).
2014-06-12 17:35:05 -07:00
Julien Pauli
a6e0751079
5.5.15 now
2014-06-11 10:21:26 +02:00
Stanislav Malyshev
979eed5c6b
5.4.31 next
2014-06-10 23:03:40 -07:00
Julien Pauli
b4c92f31ad
5.5.14 now
2014-05-14 10:24:32 +02:00
Stanislav Malyshev
b1c944dfd2
5.4.30 next
2014-05-13 22:20:15 -07:00
Michael Wallner
86b6bfb9b7
fix bug #67198 (php://input regression)
2014-05-06 12:22:08 +02:00
Michael Wallner
7308d47c4b
fix bug #67198 (php://input regression)
2014-05-06 12:21:43 +02:00
Anatol Belski
60f976a45e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix dll export
2014-04-24 10:53:31 +02:00
Anatol Belski
9280e25534
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dll export
2014-04-24 10:52:59 +02:00
Anatol Belski
acfed1c4c7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix dll export
2014-04-24 10:52:22 +02:00
Anatol Belski
03be983398
fix dll export
2014-04-24 10:51:42 +02:00
Stanislav Malyshev
dd9c80e44b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:27:55 -07:00
Stanislav Malyshev
774f16318b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:27:39 -07:00
Stanislav Malyshev
5addf223d5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86
Fix bug #65701 : Do not use cache for file file copy
2014-04-20 15:22:44 -07:00
Stanislav Malyshev
1d34d82231
5.4.29 is next
2014-04-15 16:51:38 -07:00
Julien Pauli
b8d029435d
5.5.12RC1 setup
2014-04-15 17:57:27 +02:00
Ferenc Kovacs
fb326bbd9b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix typo
2014-04-13 01:57:49 +02:00
Ferenc Kovacs
51cbb85ea9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix typo
2014-04-13 01:57:15 +02:00
Ferenc Kovacs
2876bde634
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo
2014-04-13 01:56:47 +02:00
Ferenc Kovacs
5a0da281e5
fix typo
2014-04-13 01:55:55 +02:00
Bob Weinand
eae0f529f2
Merge branch 'PHP-5.6'
2014-04-12 23:55:35 +02:00
Bob Weinand
53b1dce587
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-12 23:54:57 +02:00
Bob Weinand
9302be3754
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-12 23:54:29 +02:00
Bob Weinand
edd90e5ae3
Made usage of php_hash_environment useful by updating instead of just adding argc
2014-04-12 23:53:21 +02:00
Michael Wallner
8d4ee1dbed
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fix Bug #66736 fpassthru broken
2014-04-03 10:41:53 +02:00
Michael Wallner
55005c8638
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fix Bug #66736 fpassthru broken
2014-04-03 10:41:24 +02:00
Michael Wallner
bbd25ca01f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix Bug #66736 fpassthru broken
2014-04-03 10:40:20 +02:00
Michael Wallner
d08b4dbf23
Fix Bug #66736 fpassthru broken
2014-04-03 10:40:06 +02:00
Michael Wallner
4d412421df
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:39:16 +02:00
Michael Wallner
68c57f8149
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:38:35 +02:00
Michael Wallner
f453917f62
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:37:50 +02:00
Michael Wallner
1ec83d44a1
Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:36:39 +02:00
Michael Wallner
1d6b3f1293
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #64330
2014-04-02 11:11:39 +02:00
Michael Wallner
669459da8c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #64330
2014-04-02 11:11:23 +02:00
Michael Wallner
af147ac9b7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64330
2014-04-02 11:10:59 +02:00
Michael Wallner
91a9d24aa3
Fix bug #64330
...
stream_socket_server() creates wrong Abstract Namespace UNIX sockets
2014-04-02 11:09:26 +02:00