Nikita Popov
f4f9b54983
Revert "Move safe_address into zend_multiply.h"
...
This reverts commit 43b02e169c
.
I'm getting symbol resolution issues for zend_error_noreturn in the
opcache.so, so reverting this for now.
2014-09-06 22:12:37 +02:00
Nikita Popov
43b02e169c
Move safe_address into zend_multiply.h
...
This allows reuse in zend_arena_calloc.
Also renamed the function to zend_safe_address as it's no longer
private to the allocator.
2014-09-06 14:03:59 +02:00
Dmitry Stogov
88d7ca44f6
Refactored INI subsystem to use zend_string* instead of char*
2014-09-01 20:57:33 +04:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
33d2442a32
fix php_sapi_filter
2014-08-20 15:14:25 +02:00
Anatol Belski
bfc703bfb7
ported ext/filter
2014-08-19 21:43:22 +02:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Dmitry Stogov
bce6a36c8a
Merge branch 'master' into test
...
* master: (48 commits)
change locale - looks like not everybody has sl_SI
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
fix format
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
Fix handling of session user module custom handlers.
Reference bug report instead of github issue in NEWS file
add more exts for Travis
Update NEWS
Fix phpdbg.1 man page installation when build != src directory
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
Update NEWS
Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
...
Conflicts:
ext/opcache/zend_accelerator_util_funcs.c
ext/session/mod_user.c
ext/spl/spl_array.c
ext/spl/spl_dllist.c
ext/standard/file.c
ext/standard/streamsfuncs.c
ext/standard/string.c
main/streams/memory.c
2014-07-07 19:21:23 +04:00
Ferenc Kovacs
c66a4e84bb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
adding a reproduce script for bug #49184
2014-07-02 22:38:27 +02:00
Ferenc Kovacs
37a13d2df7
adding a reproduce script for bug #49184
2014-07-02 22:37:58 +02:00
Dmitry Stogov
0427ae08fb
cleanup
2014-06-03 00:36:31 +04:00
Dmitry Stogov
8334f38615
Fixed conversion to phpng mistakes
2014-05-28 23:04:50 +04:00
Dmitry Stogov
d41d6cf206
Interned strings must not be modified in-place
...
MAKE_COPY_ZVAL() should be changed into ZVAL_DUP()
2014-05-07 22:08:25 +04:00
Xinchen Hui
ed5b6af8af
Refactored filter
2014-05-07 16:52:58 +08:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04: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
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Adam Harvey
6f52f566f3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:51:03 -08:00
Adam Harvey
d1314893fd
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
...
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.
Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
2013-12-03 14:46:15 -08:00
Rasmus Lerdorf
55b16f40a2
Merge branch 'pull-request/499'
...
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:43:21 -07:00
Rasmus Lerdorf
6919d15a2e
Merge branch 'pull-request/499'
...
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:42:53 -07:00
David Soria Parra
2eb5661886
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
RFC 6598 reserved ip range starts at 100.64.0.0
2013-09-18 14:28:57 +02:00
David Soria Parra
7e9044b6a2
RFC 6598 reserved ip range starts at 100.64.0.0
2013-09-18 14:27:58 +02:00
David Soria Parra
5e3da04fb0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
2013-09-17 09:55:03 +02:00
Sebastian Nohn
7c279df6ae
Add RFC 6598 IPs to reserved addresses
...
(cherry picked from commit b3f5b822e9
)
2013-09-17 09:52:53 +02:00
David Soria Parra
3d6ac70e66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-16 23:36:37 +02:00
Alex Bobrov
18b54a2366
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
...
(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
2013-09-16 05:23:52 +02:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Stanislav Malyshev
476924ec3d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:31:19 -07:00
Andrey
da3886de6d
Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:25:21 -07:00
Xinchen Hui
b3f6cc20e0
Merge branch 'PHP-5.4' into PHP-5.5
2013-05-09 15:57:44 +08:00
Xinchen Hui
699dc04c55
Missed SKIPIF
2013-05-09 15:57:25 +08:00
Felipe Pena
7369a68379
- Fixed ZTS build
2013-02-03 10:57:31 -02:00
Martin Jansen
6186b67600
Add option to specific the expected separator character.
2013-02-03 13:23:54 +01:00
Martin Jansen
0661d03eba
There is no need to use memchr() for comparisons in these places.
2013-02-03 13:23:53 +01:00
Martin Jansen
2f33443883
ext/filter support for validating MAC addresses.
2013-02-03 13:23:53 +01: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
Martin Jansen
dcd99c4b19
Add more tests for the new +0/-0 behaviour.
2012-12-29 03:31:22 +01:00
Martin Jansen
3990641e62
Treat "+0" and "-0" as valid integers just like var_dump() does.
...
This fixes bug #54096 .
2012-12-29 03:31:13 +01:00
Antony Dovgal
5b82fb52fd
fix invalid read when trimming empty string
2012-11-11 22:38:14 +04: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
Lars Strojny
a26390ef0c
Bug #49510 : Boolean validation fails with FILTER_NULL_ON_FAILURE with empty string or false
2012-09-02 22:10:23 +02:00
Anatoliy Belsky
455040c4ab
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug ext\filter\tests\bug52209.phpt fails
2012-04-30 10:28:00 +02:00
Anatoliy Belsky
8249581a2d
Fix bug ext\filter\tests\bug52209.phpt fails
2012-04-30 10:25:54 +02:00