php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 22:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,629 Commits 547 Branches 1,483 Tags
a370e7d0ade965a0fbd846e72ffc73a35bb6a3e2
Commit Graph

2014 Commits

Author SHA1 Message Date
Christoph M. Becker
36946f5c45 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #68825: Exception in DirectoryIterator::getLinkTarget()
 2018-08-22 15:38:30 +02:00
Christoph M. Becker
32a728d351 Fix #68825: Exception in DirectoryIterator::getLinkTarget() 
intern->file_name may not have been properly set when
DirectoryIterator::getLinkTarget() is called, so we make sure it is
before using it.
 2018-08-22 15:37:02 +02:00
Christoph M. Becker
41d2102c77 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add regression test for bug #68175
  Fix #68175: RegexIterator pregFlags are NULL instead of 0
 2018-08-18 14:37:48 +02:00
Christoph M. Becker
4c448334bd Add regression test for bug #68175 2018-08-18 14:36:16 +02:00
Tim Siebels
3257d22fea Fix #68175: RegexIterator pregFlags are NULL instead of 0 2018-08-18 14:33:39 +02:00
Xinchen Hui
dc461d6f56 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76367 (NoRewindIterator segfault 11)
 2018-05-23 14:46:01 +08:00
Xinchen Hui
8f221bdec0 Fixed bug #76367 (NoRewindIterator segfault 11) 2018-05-23 14:45:38 +08:00
Joe Watkins
3e267ca91b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #76131 some arginfo params are different from the documentation
 2018-03-27 21:58:24 +02:00
Gabriel Caruso
63934ea71e Fix #76131 some arginfo params are different from the documentation 2018-03-27 21:56:46 +02:00
Joe
ab770401e1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74519 strange behavior of AppendIterator
 2018-02-08 10:18:31 +01:00
CHU Zhaowei
01eafceea1 Fixed bug #74519 strange behavior of AppendIterator 2018-02-08 10:16:24 +01:00
CHU Zhaowei
495508eceb fix #74519 strange behavior of AppendIterator 2018-02-08 10:15:09 +01:00
Christoph M. Becker
96595a232a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"
 2018-01-27 13:13:06 +01:00
Christoph M. Becker
a882f95e39 Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature" 
This reverts commit 4bd7658e1b.

To avoid the BC break we apply the fix to master only.
 2018-01-27 13:11:30 +01:00
Christoph M. Becker
d7a02844f9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature
 2018-01-27 12:41:15 +01:00
Christoph M. Becker
4bd7658e1b Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature 2018-01-27 12:33:36 +01: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
Nikita Popov
12e991f5bd Merge branch 'PHP-7.1' into PHP-7.2 2017-12-22 18:22:47 +01:00
Nikita Popov
f14b6f4920 Fixed bug #73209 2017-12-22 18:22:00 +01:00
Nikita Popov
2c880037f5 Merge branch 'PHP-7.1' into PHP-7.2 2017-12-22 18:12:17 +01:00
Nikita Popov
ec142f2c86 Fixed bug #75242 2017-12-22 18:11:38 +01:00
Nikita Popov
74e3da5c8c Merge branch 'PHP-7.1' into PHP-7.2 2017-12-22 18:01:30 +01:00
Nikita Popov
ccb113c3e5 Fixed bug #75717 2017-12-22 18:01:03 +01:00
Xinchen Hui
bad5639386 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning
 2017-09-24 17:24:57 +08:00
Xinchen Hui
e8c200515a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning
 2017-09-24 17:24:23 +08:00
Xinchen Hui
db63367871 Compiler warning 2017-09-24 17:19:05 +08:00
Christoph M. Becker
43152bc39f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags)
 2017-09-20 15:54:07 +02:00
Christoph M. Becker
0c0b955d5f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags)
 2017-09-20 15:47:02 +02:00
Christoph M. Becker
eedc060c92 Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags) 
We must not overwrite the SPL_DLLIST_IT_FIX flag when changing the
iterator mode.
 2017-09-20 15:46:04 +02:00
Joe Watkins
f87e513557 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
 2017-09-12 07:08:01 +01:00
Joe Watkins
7015d22116 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
 2017-09-12 07:06:35 +01:00
jhdxr
3e11b7fc21 fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop 2017-09-12 07:05:58 +01:00
Nikita Popov
b2824629c2 Merge branch 'PHP-7.1' into PHP-7.2 2017-09-04 21:24:32 +02:00
Nikita Popov
c2e3541cc1 Add test for bug #75155 2017-09-04 21:23:07 +02:00
Nikita Popov
b689857d53 Revert "Fixed #74977 - Appending AppendIterator leads to segfault" 
This reverts commit dbc2ffba82.
 2017-09-04 21:20:49 +02:00
Xinchen Hui
e7dd9c781b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
 2017-08-09 11:29:46 +08:00
Xinchen Hui
307acb6618 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results)
 2017-08-09 11:29:13 +08:00
Xinchen Hui
b06f8cb58b Fixed bug #75049 (spl_autoload_unregister can't handle spl_autoload_functions results) 2017-08-09 11:28:53 +08:00
Tyson Andre
5097e2ee13 Implement spl_object_id(object $x) : int 
spl_object_id is a new function returning the object handle,
as a signed integer.

Discussion for this new function is ongoing on php-internals, see
https://marc.info/?t=143835274500003&r=1&w=2

The object id is unique for the lifetime of the object.
When the object is garbage collected,
different objects may & will have the same object id.

- This is also the case for the string generated by spl_object_hash

It is always possible to cast the object handle to a **signed** zend_long
in php 7.2. _zend_object->handle is always of the type `uint32_t`.
(zend_long is 32 bits on 32 bit builds, 64 bits on 64 bit builds)

As of php 7.0, the object id uniquely identifies the object,
there can't be two objects with the same id but different handlers
(See the implementation of spl_object_hash)

Skip the pointless XORing, as discussed in internals.

- It was intended to avoid exposing in-memory addresses.
- The object handle is not a memory address.
- The output of var_dump() includes the object handle(id)
 2017-08-02 17:54:07 +02:00
Julien Pauli
4f06b62781 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Updated NEWS
  Updated NEWS
  Fix #75015. Crash in SPL destructors
 2017-08-01 16:02:36 +02:00
Julien Pauli
cd06b5af09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Updated NEWS
  Fix #75015. Crash in SPL destructors
 2017-08-01 16:02:00 +02:00
Julien Pauli
64e6ddc7f7 Fix #75015. Crash in SPL destructors 2017-08-01 15:59:54 +02:00
Joe Watkins
2e8759428b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #74977 - Appending AppendIterator leads to segfault
 2017-07-25 06:40:25 +01:00
andrewnester
dbc2ffba82 Fixed #74977 - Appending AppendIterator leads to segfault 2017-07-25 06:39:50 +01:00
Nikita Popov
a624ded4d3 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-18 22:16:33 +02:00
Nikita Popov
8e7c99acf4 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-18 22:16:11 +02:00
andrewnester
afc22828ea Fixed #74699 - Broken ArrayIterator unserializing 2017-07-18 22:14:11 +02:00
Dmitry Stogov
09d3b7386c Resources should be closed during object destructioin, not during freeing. 2017-07-12 18:53:16 +03:00
Sara Golemon
f066f59eab Add NEWS entry and a test for Bug#71412 2017-07-02 10:41:38 -04:00