1f496744ed
Merge branch 'PHP-5.5' into PHP-5.6
2014-08-11 17:47:36 +08:00
41eb63e78f
Fixed tests affect by local ini
2014-07-09 18:34:40 +08:00
e65e013e15
Fix bug #67587 : Redirection loop on nginx with FPM
...
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:
set $path_info $fastcgi_path_info;
fastcgi_param PATH_INFO $path_info;
2014-07-08 12:54:57 -07:00
5312c39cfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67587 : Redirection loop on nginx with FPM
2014-07-08 12:54:20 -07:00
0bf50a8302
Fix bug #67587 : Redirection loop on nginx with FPM
...
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:
set $path_info $fastcgi_path_info;
fastcgi_param PATH_INFO $path_info;
2014-07-08 12:53:45 -07:00
9d8a00337d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:38 -03:00
b99862e7ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:25 -03:00
fb3b8de98d
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:45:17 -03:00
ab8065e4ec
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix accepting ill-formed UTF-8 characters
2014-04-22 16:57:47 -07:00
aca526a13b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix accepting ill-formed UTF-8 characters
Conflicts:
ext/phar/phar_path_check.c
2014-04-22 16:57:17 -07:00
61499bf282
Fix accepting ill-formed UTF-8 characters
...
Conflicts:
ext/phar/phar_path_check.c
2014-04-22 16:55:58 -07:00
32d5f269a0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:23:52 -07:00
dafb2af705
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
Conflicts:
ext/phar/phar_path_check.c
2014-04-20 17:22:21 -07:00
ea4cee93c8
Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:19:20 -07:00
a93e734f81
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-14 00:08:36 +02:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
c675980046
Merge branch 'pull-request/500'
...
* pull-request/500:
limit virtual_cwd_activate() duplicated call to ZTS only
reverted the previous commit, both calls are needed in TS mode
virtual_cwd_activate() should be called only in one place
back to do_alloca()
removed unnecessary call
simplify the state free macros
compact the code to preserve the error info after state freeing
back to do_alloca(), reverted the wrong replacement
enabled windows to use stack in both ts/nts mode, some more fixes
moved to do_alloca() usage where appropriate
fixed invalid free
fixed virtual cwd header in phar
updated NEWS
fixed all the places where last error could be lost
preserve the error code
applied and fixed the original patch
initial move on renaming files and fixing includes
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
6c8ff0031c
Merge branch 'PHP-5.5'
...
Conflicts:
ext/phar/phar_internal.h
ext/phar/stream.c
ext/phar/util.c
2013-11-05 19:29:13 +08:00
63dba7ec9d
Remove outdate codes, make it clearer, although just a bit..
2013-11-05 18:47:12 +08:00
15eabbb436
Merge branch 'PHP-5.5'
2013-11-04 14:43:30 +08:00
3d4ef50dd7
Fixed coredump due to abnormal implemention of phar
2013-11-04 14:42:54 +08:00
e17de5e9fd
Merge branch 'bug50333' of github.com:weltling/php-src into bug50333
2013-10-29 17:15:40 +01:00
7fe370f9c7
Merge branch 'PHP-5.5'
2013-10-27 16:53:35 +08:00
a3bd4fda09
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-27 16:53:13 +08:00
e18e7a5983
remove "PHP 6" staff
2013-10-27 16:52:43 +08:00
d23f089fb9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed possible NULL ptr dereference
2013-10-20 09:04:36 -02:00
5b0560efc3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible NULL ptr dereference
2013-10-20 09:04:27 -02:00
52555a7894
- Fixed possible NULL ptr dereference
2013-10-20 09:04:24 -02:00
e1f9993ba8
Merge branch 'PHP-5.5'
2013-10-19 22:19:11 +08:00
d42fa2a059
Revert "Need a way to check whether this API exists"
...
hmm, we can check whether the head file exists instead
This reverts commit 4d7d85640d
2013-10-19 22:18:37 +08:00
b96bee6fdd
Merge branch 'PHP-5.5'
2013-10-19 22:17:06 +08:00
4d7d85640d
Need a way to check whether this API exists
2013-10-19 22:16:31 +08:00
ecd03baf61
fixed virtual cwd header in phar
2013-10-18 10:02:19 -07:00
065bbeb83f
Merge branch 'PHP-5.5'
2013-10-18 10:34:59 +08:00
4417421ab6
Retruning SUCCESS/FAILURE instead of int
2013-10-18 10:33:53 +08:00
a1a7522105
Merge branch 'PHP-5.5'
2013-10-17 12:25:01 +08:00
06994a419d
Add ability of alias resolving (it cause problem while work with opcache)
2013-10-17 12:23:09 +08:00
cdf5d201ab
fix test concurrency
2013-09-18 11:02:45 +02:00
14d5341787
fix test concurrency
2013-09-18 10:52:51 +02:00
db6d93feca
Remove some more unnecessary macros from phar
2013-09-13 21:49:09 +02:00
e6b228332f
Remove PHAR_(Z)STR* usages
2013-09-13 21:49:09 +02:00
39bd738fbf
Remove version checks in phar
...
No need to keep around compatability code for PHP 5.0 and PHP 6.
2013-09-13 21:47:59 +02:00
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
43cbec0fa9
Fix phar phpinfo test after markup changes
2013-08-03 16:32:02 +02:00
1c91ca990f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
2013-08-01 08:49:19 -07:00
146b933ab4
Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
...
This reverts commit 017145bc57
2013-08-01 08:47:13 -07:00
1f6b940dd1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use PHP's major version when cleaning up Apache .module files
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:36:20 -07:00
017145bc57
Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:31:50 -07:00
Xinchen Hui