Christoph M. Becker
a96ca13963
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #76643 : Segmentation fault when using `output_add_rewrite_var`
2018-07-24 12:28:22 +02:00
Christoph M. Becker
40bd84d3e3
Fix #76643 : Segmentation fault when using output_add_rewrite_var
...
We have to check whether _SERVER is actually an array before we're
going to use it as such.
2018-07-24 12:20:13 +02:00
Andrew Nester
68296c4055
Fixed #74892 - Fixed URL rewriting for urls started with #
...
(cherry picked from commit 6c32d271d29cd82df0bb
2018-04-12 17:28:35 +02:00
Xinchen Hui
7a7ec01a49
year++
2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7
year++
2018-01-02 12:53:31 +08:00
Andrew Nester
6c32d271d2
Fixed #74892 - Fixed URL rewriting for urls started with #
2017-07-18 21:20:03 +02:00
Nikita Popov
46bfad56be
Merge branch 'PHP-7.1'
2017-02-16 17:28:14 +01:00
Nikita Popov
976225ef23
Merge branch 'PHP-7.0' into PHP-7.1
2017-02-16 17:28:05 +01:00
Nikita Popov
cf3ef36323
Fix memory errors in url rewriter
...
Strings aren't terminated here...
2017-02-16 17:24:07 +01:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce
Update copyright headers to 2017
2017-01-02 09:30:12 -06:00
Anatol Belski
b204b3abd1
further normalizations, uint vs uint32_t
...
fix merge mistake
yet one more replacement run
2016-11-26 17:29:01 +01:00
Anatol Belski
2c02e93e69
fix leak
2016-09-02 19:46:32 +02:00
Anatol Belski
872028de20
fix TS issues with url rewrite globals
2016-08-20 22:41:06 +02:00
Xinchen Hui
dd618664a0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #72813 (Segfault with __get returned by ref)
Fix URL rewriter partially
Conflicts:
Zend/zend_object_handlers.c
ext/standard/url_scanner_ex.c
ext/standard/url_scanner_ex.re
2016-08-12 16:35:41 +08:00
Yasuo Ohgaki
ae3782a0db
Fix URL rewriter partially
2016-08-11 09:18:47 +09:00
Yasuo Ohgaki
a53a6b3fb4
Fix URL rewriter issues
2016-08-11 08:31:48 +09:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Dmitry Stogov
4a2e40bb86
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 04:05:24 +03:00
Yasuo Ohgaki
f248df9003
Cleanup trans sid code. Behavior is unchanged.
...
Fixed possible injections. Escape values usually internal safe values.
2015-02-02 17:06:16 +09:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Xinchen Hui
f3ea1b0b6a
Fixed #68694
2015-01-08 16:28:32 +08:00
Anatol Belski
e112f6a04e
second shot on removing TSRMLS_*
2014-12-14 14:07:59 +01:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
11b119d526
fix datatype mismatches
2014-10-27 16:38:47 +01:00
Nikita Popov
a770d29df7
Add smart_str_append for appending zend_strings
...
Also replaces usages in Zend/ and ext/standard
2014-09-21 20:58:31 +02:00
Nikita Popov
2a7de9fdbb
Rename smart_str_append to smart_str_append_smart_str
...
It's used only rarely and I'm running out of append names...
2014-09-21 20:49:39 +02:00
Nikita Popov
e33f3d3b7c
Move smart_str implementation into Zend/
...
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +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
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5
fixes to %pd format usage
2014-08-24 02:35:34 +02:00
Anatol Belski
41115d3d9d
regenerated parser files
2014-08-17 21:05:20 +02:00
Dmitry Stogov
b108267f2c
Merge branch 'master' into phpng
...
* master: (41 commits)
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
Update copyright year to 2014
NEWS
Fix Request #67453 Allow to unserialize empty data.
Update copyright year to 2014
Update copyright year for re2c generated files
Update copyright year to 2014
Update copyright year for re2c files as well
Fix patch for bug #67436
fix failed test
Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
Added tests for bug 67436
Fixed wrong XFAIL test - already fixed
Fix typo in Bug #67406 NEWS entry
Fix typo in Bug #67406 NEWS entry
...
Conflicts:
Zend/zend_compile.c
ext/session/session.c
ext/standard/array.c
ext/standard/http_fopen_wrapper.c
tests/classes/bug63462.phpt
2014-06-18 17:50:27 +04:00
Xinchen Hui
35199a3d0c
Fixed null pointer dereference
2014-03-30 17:53:17 +08:00
Xinchen Hui
5c1595ca8e
Refactor session (incompleted)
2014-03-29 17:39:26 +08:00
Xinchen Hui
3647fc6fcc
Refactor session (incompleted)
2014-03-28 18:46:25 +08:00
Dmitry Stogov
1b2b7f410f
Fixed URL scanner
2014-03-18 11:18:40 +04:00
Xinchen Hui
3e93cd9fd7
Fixed serval segfaults
2014-03-03 16:46:18 +08:00
Xinchen Hui
07eb0f4970
Fixed NULL pointer def
2014-03-03 16:42:34 +08:00
Xinchen Hui
b07d5913dd
Refactor php_url_(en|de)code to return zend_string
2014-03-03 16:34:43 +08:00
Xinchen Hui
43b03c74b3
Refacting smart_str
2014-02-18 17:42:46 +08:00
Dmitry Stogov
2b9b9afa7a
Use better data structures (incomplete)
2014-02-17 17:59:18 +04:00
Dmitry Stogov
40e053e7f3
Use better data structures (incomplete)
2014-02-13 17:54:23 +04:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
