php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-25 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,418 Commits 547 Branches 1,481 Tags
ec00a4de4e8db83c07afde9a182d43fe73d860c9
Commit Graph

4394 Commits

Author SHA1 Message Date
Reeze Xia
2dac92b244 Silence a empty while loop warning 2015-03-04 11:34:53 +08:00
Dmitry Stogov
2fa8d67a5c Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. 2015-03-04 02:05:28 +03:00
Reeze Xia
bb2e62ecda Merge branch 'PHP-5.6' 
* PHP-5.6:
  Improve fix for bug 67741

Conflicts:
	main/main.c
 2015-03-03 16:29:41 +08:00
Reeze Xia
6cb3b941df Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improve fix for bug 67741
  Added type checks
  Added type checks
 2015-03-03 16:27:35 +08:00
Reeze Xia
860fc3947f Improve fix for bug 67741 
Thanks to laruence.
 2015-03-03 16:25:43 +08:00
Reeze Xia
c6e415aeb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)

Conflicts:
	main/main.c
 2015-03-03 11:44:52 +08:00
Reeze Xia
4e2c87edb3 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:43:23 +08:00
Reeze Xia
34f09b6240 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:25:30 +08:00
Xinchen Hui
8f5676f73e Merge branch 'PHP-5.6' 2015-02-27 12:03:04 +08:00
Xinchen Hui
578903578c Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 12:03:00 +08:00
Xinchen Hui
4eb830b212 Reorder 2015-02-27 12:02:42 +08:00
Xinchen Hui
b0e95e1e35 Merge branch 'PHP-5.6' 2015-02-27 12:01:40 +08:00
Xinchen Hui
d377cb6207 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 12:01:05 +08:00
Xinchen Hui
ebfc49aa91 Fixed bug #69121 (Segfault in get_current_user when script owner is not in passwd with ZTS build) 2015-02-27 12:00:52 +08:00
Rasmus Lerdorf
a9ba407ce1 Fix bug #68166 
We can't always efree here
php_escape_html_entities can return an interned_empty_string
 2015-02-22 08:25:56 -08:00
Rasmus Lerdorf
e12b72d3f7 Fix bug #68166 
We can't always efree here
php_escape_html_entities can return an interned_empty_string
 2015-02-22 08:14:41 -08:00
Xinchen Hui
4629f8978e Cleanup globals initialization 
No needs explicit inititlize zero for globals in no-zts build.
executor_globals should be initialized in zend side.
 2015-02-21 11:35:16 +08:00
Michael Wallner
34ff6bbb0d this line got accitentally dropped on merge 2015-02-19 10:50:03 +01:00
Michael Wallner
b36581aa75 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
 2015-02-18 14:04:19 +01:00
Michael Wallner
0d2a2b98c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #65593 (Segfault when calling ob_start from output buffering callback)
 2015-02-18 13:59:32 +01:00
Michael Wallner
225af964c0 Fixed bug #65593 (Segfault when calling ob_start from output buffering callback) 2015-02-18 13:58:31 +01:00
Anatol Belski
af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls 
which also comply with the current semantics for such macros
 2015-02-16 17:19:32 +01:00
Dmitry Stogov
e10e151e9b Merged zend_array and HashTable into the single data structure. 
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
 2015-02-13 22:20:39 +03:00
Xinchen Hui
e5d8a14239 Revert "Cleanup globals initialization" 
This reverts commit 309e90638d.
 2015-02-13 18:25:44 +08:00
Xinchen Hui
309e90638d Cleanup globals initialization 2015-02-13 10:58:35 +08:00
Dmitry Stogov
1eb4352143 Use new ZEND_HASH_FOREACH_... API. 2015-02-10 15:43:12 +03:00
manuel
cc13d8696f Fix another invalid free of CG(interned_empty_string) 
Fixes #68214
 2015-02-07 19:17:31 +01:00
manuel
13fc7f20a4 Invalid free of CG(interned_empty_string) 
On failure php_escape_html_entities returns STR_EMPTY_ALLOC which is an
alias of CG(interned_empty_string) if interned strings are enabled.
Make sure we don't free this.
 2015-02-06 16:53:01 +01:00
Stanislav Malyshev
c3eac70c76 Update header handling to RFC 7230 2015-02-05 20:10:28 -08:00
Stanislav Malyshev
a1c28567c6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update header handling to RFC 7230
 2015-02-05 20:10:09 -08:00
Stanislav Malyshev
067340bbc8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update header handling to RFC 7230
 2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073 Update header handling to RFC 7230 2015-02-05 20:08:12 -08:00
Xinchen Hui
e70c9f04ec Remove extra space 2015-02-05 16:33:45 +08:00
Xinchen Hui
ae90010891 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	main/streams/memory.c
 2015-02-05 16:33:20 +08:00
Nayana Hettiarachchi
5446377c6b Conflicts: 
main/streams/memory.c
 2015-02-05 16:32:30 +08:00
Xinchen Hui
22a468dc71 return size_t 2015-02-05 16:26:38 +08:00
Nayana Hettiarachchi
a3e07ff10c #68986 bug fix 2015-02-05 12:26:29 +08:00
Julien Pauli
e6ea244004 5.6.7 now 2015-02-04 16:37:49 +01:00
Julien Pauli
b86529f751 5.5.23 now 2015-02-04 16:35:32 +01:00
Xinchen Hui
6fe8dce671 Merge branch 'resource-api' of https://github.com/laruence/php-src 2015-02-04 11:39:57 +08:00
Anatol Belski
d920cc427b fix incompatible pointer warning 
php_alphasort() isn't directly compatible with qsort() cb def
 2015-02-03 17:52:18 +01:00
Xinchen Hui
ef1505821b Merge branch 'PHP-5.6' 2015-02-03 23:24:53 +08:00
Xinchen Hui
1bb7647c6e Fixed indent 2015-02-03 23:24:34 +08:00
Xinchen Hui
38829b3b4b Merge branch 'master' into resource-api 2015-02-03 23:01:48 +08:00
Yasuo Ohgaki
feef180e6c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.

Conflicts:
	main/main.c
	tests/basic/encoding.phpt
 2015-02-03 19:00:13 +09:00
Yasuo Ohgaki
436ba1c488 Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set. 2015-02-03 18:52:46 +09:00
Xinchen Hui
e98caf27ea found type is unnecessary 2015-02-02 14:45:19 +08:00
Xinchen Hui
7ec8eb380d Use resource directly 2015-02-02 13:56:20 +08:00
Xinchen Hui
38efb690c0 Ported ftp 2015-02-02 13:53:03 +08:00
Xinchen Hui
942809909e Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00