clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
106,914 Commits 491 Branches 1,363 Tags 838 MiB
d03e95442a
Commit Graph

47946 Commits

Author SHA1 Message Date
Dmitry Stogov
4d75504d4f Avoid double copying and string length recalculation 2018-03-06 21:19:18 +03:00
Christoph M. Becker
a98eb1ec2c [ci skip] Fix reference notation in protos 2018-03-06 13:22:39 +01:00
Gabriel Caruso
b47b3596ef [ci skip] Use float instead of double in proto 2018-03-06 13:16:18 +01:00
Dmitry Stogov
44e1d2f8a9 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.
 2018-03-06 03:00:46 +03:00
Dmitry Stogov
020a02ef9d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.
 2018-03-06 02:47:01 +03:00
Dmitry Stogov
50949c9332 Replaced usafe reference from SHM to process memory with SHM to SHM reference. 2018-03-06 02:43:26 +03:00
Dmitry Stogov
47f5f87826 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 01:02:31 +03:00
Dmitry Stogov
b48d2f6d10 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 01:00:14 +03:00
Dmitry Stogov
b711a96acb Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). 
Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 00:56:16 +03:00
Dmitry Stogov
d740024e35 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed invalid destructor
 2018-03-06 00:47:05 +03:00
Dmitry Stogov
b7ebf90221 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid destructor
 2018-03-06 00:46:40 +03:00
Dmitry Stogov
a83581e223 Fixed invalid destructor 2018-03-06 00:46:19 +03:00
Dmitry Stogov
d9d30a7f38 AST is not COPYABLE anymore and its reference-counter doesn't have to be initialized by 2. 2018-03-06 00:30:25 +03:00
Dmitry Stogov
84a0423e05 Set and keep HASH_FLAG_STATIC_KEYS for all HashTables stored in SHM (or file cache). 2018-03-06 00:00:13 +03:00
Dmitry Stogov
d76061d5c1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed invalid destructor
 2018-03-05 23:38:15 +03:00
Dmitry Stogov
53baf6fa1d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid destructor
 2018-03-05 23:33:53 +03:00
Dmitry Stogov
87553b0730 Fixed invalid destructor 2018-03-05 23:33:08 +03:00
Nikita Popov
4838e9799f Merge branch 'PHP-7.2' 2018-03-05 15:33:34 +01:00
Nikita Popov
634a1ff033 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-05 15:32:39 +01:00
Nikita Popov
fd5bd37ab1 Revert "Fixed bug #75961 (Strange references behavior)" 
This reverts commit 94e9d0a2ae.

This code needs to be mindful about modifications to the array
happening during callback execution. It was written in a way that
only accessed the reference, which is guaranteed not to move. The
changed implementation instead accesses the array slot, leading to
use-after-free.

Run ext/standard/tests/array/bug61967.phpt under valgrind to see
the issue.
 2018-03-05 15:32:21 +01:00
Anatol Belski
cf84e5a529 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Include username into the file cache path
 2018-03-05 15:22:11 +01:00
Anatol Belski
54212dfbf9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Include username into the file cache path
 2018-03-05 15:21:31 +01:00
Anatol Belski
27a603e811 Include username into the file cache path 2018-03-05 15:16:55 +01:00
Dmitry Stogov
f32b7dbc43 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed "opcache.file_cache_fallback" mode.
 2018-03-05 16:21:20 +03:00
Dmitry Stogov
a8fbb15311 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed "opcache.file_cache_fallback" mode.
 2018-03-05 16:15:38 +03:00
Dmitry Stogov
350082ed71 Fixed "opcache.file_cache_fallback" mode. 
It's not safe to change value of ZCG(accel_directives).file_cache_only, becuse it might be altered by INI subsystem.
Use global variable instead.
 2018-03-05 16:01:43 +03:00
Christoph M. Becker
eeda55cb3b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #76041: null pointer access crashed php
 2018-03-02 17:21:04 +01:00
Christoph M. Becker
d83467d70b Fix #76041: null pointer access crashed php 
We must not draw anti-aliased lines on palette images, because that is
not supported by `gdImageSetAAPixelColor()` and it wouldn't make much
sense to support it, due to the limitation to at most 256 colors.
 2018-03-02 17:18:45 +01:00
Xinchen Hui
c29f1f41c3 Combines common codes 2018-03-02 10:32:15 +08:00
Anatol Belski
0d679c353c Get rid of casts 2018-03-01 20:52:09 +01:00
Anatol Belski
b9040b812c Merge branch 'PHP-7.2' 
* PHP-7.2:
  Remove TSRMLS_*
 2018-03-01 12:15:20 +01:00
Anatol Belski
3c58b2c31a Remove TSRMLS_* 2018-03-01 12:12:11 +01:00
Xinchen Hui
966923f4be Attempt to fix build again 
seems if a cpu supports avx2 but not ssse3, the build will fail. but how
could that possible... :<
 2018-03-01 15:05:50 +08:00
Xinchen Hui
fd208e82dd Attempt to fix build reported fails in containers 2018-03-01 11:56:12 +08:00
Bob Weinand
dfa383497a Merge remote-tracking branch 'origin/PHP-7.2' 2018-02-28 02:36:18 +01:00
Bob Weinand
15d611e451 Merge branch 'PHP-7.1' into PHP-7.2 2018-02-28 02:35:44 +01:00
Bob Weinand
3f32bd9f43 Fix pcntl build on mac 
Apparently on mac WIF*(x) macros resolve to (*(int*)&x) (_W_INT macro in sys/wait.h), forcing the value to be a lvalue
 2018-02-28 02:13:28 +01:00
Bob Weinand
c1882ef004 Fixed build (extern php_stripslashes) 2018-02-28 01:47:40 +01:00
Dmitry Stogov
6f483dc94c Use macros to update specific parts of GC_TYPE_INFO() (direct assignments to GC_TYPE(), GC_FLAGS() and GC_INFO() are prohibited) 2018-02-28 00:52:12 +03:00
Christoph M. Becker
ef255c9f0f Revert "[ci skip] Add missing return types to protos" 
This reverts commit a2c7c46d5e.

Since apparently there have been some mistakes in this commit, and it's
not clear yet how to solve them, we're reverting for now.
 2018-02-27 17:40:03 +01:00
Stanislav Malyshev
5913d8cec6 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:27:02 -08:00
Stanislav Malyshev
ab9f9b5d3b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:55 -08:00
Stanislav Malyshev
a6f7760d57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:50 -08:00
Stanislav Malyshev
dde7a05978 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:26 -08:00
Stanislav Malyshev
523f230c83 Fix bug #75981: prevent reading beyond buffer start 2018-02-26 22:25:51 -08:00
Xinchen Hui
13eca3d428 Avoding memory allocation 2018-02-26 16:54:53 +08:00
Xinchen Hui
fd88e7e3a1 Avoding memory allocation 2018-02-26 16:48:49 +08:00
Xinchen Hui
ce3fa92027 Avoding memory allocation if no translastion found 2018-02-26 14:52:45 +08:00
Gabriel Caruso
5f54f48024 [ci skip] Remove space between function name and open parentheses 2018-02-24 11:50:39 +01:00
Gabriel Caruso
a2c7c46d5e [ci skip] Add missing return types to protos 2018-02-24 11:45:17 +01:00