clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,731 Commits 494 Branches 1,367 Tags 800 MiB
cf910f351a
Commit Graph

78731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Hristov
89ea2650a1 Fix test 2014-03-26 13:56:58 +02:00
Derick Rethans
dcc0644cde Merge branch 'PHP-5.5' into PHP-5.6 2014-03-25 12:17:19 +00:00
Derick Rethans
039cb10fa3 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-25 12:17:15 +00:00
Derick Rethans
170cf3ec00 - Updated to version 2014.2 (2014b) 2014-03-25 12:17:14 +00:00
Remi Collet
5f0428e8cc fix merge issue 2014-03-25 12:07:15 +01:00
Tjerk Meesters
98163c7d1b Updated NEWS for #66834 2014-03-25 18:16:30 +08:00
Tjerk Meesters
5dee3c11fe Call offsetGet() when called with isset() on ArrayObject derivatives 2014-03-25 18:15:18 +08:00
Remi Collet
c5f6d1ab29 NEWS 2014-03-25 11:04:49 +01:00
Remi Collet
64d7dd55d3 Fix merge (5.6 already have file 5.17) 2014-03-25 11:03:59 +01:00
Remi Collet
8b7b67a21b NEWS 2014-03-25 11:01:56 +01:00
Remi Collet
84b0ab6d8f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
 2014-03-25 11:01:20 +01:00
Remi Collet
3616db6d38 NEWS 2014-03-25 11:00:47 +01:00
Remi Collet
4374a52e9d Fixed bug #66946 extensive backtracking in awk rule regular expression 
CVE-2013-7345

Applied upstream patch:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 11:00:33 +01:00
Remi Collet
1df558c6a0 Fixed bug #66946 extensive backtracking in awk rule regular expression 
CVE-2013-7345

Applied upstream patch:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 10:58:50 +01:00
Anatol Belski
655f2973eb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix disabling PGO for extensions, rel bug #65715
 2014-03-25 06:46:06 +01:00
Anatol Belski
7477f5b387 fix disabling PGO for extensions, rel bug #65715 2014-03-25 06:44:54 +01:00
Anatol Belski
59dcf9879b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  more fixes related to bug #65715
 2014-03-24 19:19:06 +01:00
Anatol Belski
223f7d9a44 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  more fixes related to bug #65715
 2014-03-24 19:18:39 +01:00
Anatol Belski
6612e1ba6a more fixes related to bug #65715 2014-03-24 19:15:02 +01:00
Michael Wallner
caba0203e8 fix some warnings 2014-03-24 17:51:50 +01:00
Michael Wallner
275b2c420d PHP-5.6 compatibility for apache2 filter SAPI 2014-03-24 17:48:28 +01:00
Anatol Belski
26f7051cf4 updated NEWS 2014-03-24 10:31:08 +01:00
Anatol Belski
13e8486550 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
 2014-03-24 10:30:05 +01:00
Anatol Belski
8558640a6a updated NEWS 2014-03-24 10:29:39 +01:00
Anatol Belski
76066b304c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
 2014-03-24 10:28:48 +01:00
Anatol Belski
5efda763be updated NEWS 2014-03-24 10:28:21 +01:00
Anatol Belski
17a57ad980 Fixed bug #65715 php5embed.lib isn't provided anymore 2014-03-24 10:24:37 +01:00
Anatol Belski
9d4001f1c8 fix C89 compat 2014-03-22 10:44:01 +01:00
Andrey Hristov
61103cc25c Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-21 14:33:44 +02:00
Nikita Popov
f331ed1414 Revert "Add helper function for updating bucket contents" 
Reverting this for now, because it would require further changes
thanks to the zend signals tsrms-but-only-sometimes awesomeness.
 2014-03-21 01:32:49 +01:00
Nikita Popov
4e7e301dda Rename+move zend_hash_apply_deleter and reuse it 
The interruption handling was normalized to wrap the entire deletion
operation (instead of leaving out the destructor call and/or the
deallocation) per the recommendation of somebody (don't remember who)
familiar with zend signals.

There is an always-inlined variant of the function for use in
the main deletion function, to ensure there is no performance
impact.
 2014-03-21 00:14:52 +01:00
Nikita Popov
4efa58dd59 Make zend_hash_apply_deleter() void, to allow reuse 
Also remove lies in the comment above the function. apply_deleter
is not safe against modification, if the modification involves
removing the next bucket.

Also modified the implementation of zend_hash_graceful_destroy()
to be fully graceful (the reverse variant already was).
 2014-03-21 00:14:51 +01:00
Nikita Popov
c3a317117a Add helper function for updating bucket contents 2014-03-21 00:14:46 +01:00
Nikita Popov
994fcfcff9 Remove unnecessary check 
In case of an update the key already existed, so the next free
element can not change.
 2014-03-20 22:58:10 +01:00
Andrey Hristov
113f22550a Fixes after merge 2014-03-20 17:28:49 +02:00
Andrey Hristov
d2ab74588e Merge branch 'PHP-5.5' into PHP-5.6 2014-03-20 16:30:01 +02:00
Andrey Hristov
41b4b84dda Emit a warning in case of unallowed characters. Fix another place this 
code is used - reuse
 2014-03-20 16:23:40 +02:00
Remi Collet
7f7c84d64f add info: empty strings are interned 2014-03-20 15:18:41 +01:00
Andrey Hristov
e52334fdbe Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/mysqli/mysqli_api.c
 2014-03-20 16:16:12 +02:00
Andrey Hristov
059bc99d94 don't replace with ?, just skip it 2014-03-20 12:11:16 +02:00
Yasuo Ohgaki
e1fe76f28a Add default_charset handling 2014-03-20 10:50:32 +09:00
Tjerk Meesters
d0e3173016 Updated UPGRADING to add three changes 2014-03-20 07:44:23 +08:00
Christopher Jones
014c5706a8 Merge branch 'oci_field_doc_prototype_fixes' into PHP-5.6 
* oci_field_doc_prototype_fixes:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
 2014-03-19 15:23:07 -07:00
Christopher Jones
6c20b07190 OCI8: fix prototypes for oci_field_*(). They can take a column index or name. 2014-03-19 15:20:40 -07:00
Christopher Jones
8bdf272758 Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing 2014-03-19 14:10:56 -07:00
Andrey Hristov
62ab3af12f fix compilation error 2014-03-19 19:15:04 +02:00
Andrey Hristov
b86595a37c Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
 2014-03-19 18:55:29 +02:00
Andrey Hristov
44fb74fad1 fix typo 2014-03-19 18:54:56 +02:00
Andrey Hristov
01c2ec03bc Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h
 2014-03-19 18:54:39 +02:00
Andrey Hristov
d63ed101ee Fix problem with mysqli_commt()/mysqli_rollback() 2014-03-19 18:32:19 +02:00