clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 13:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,218 Commits 494 Branches 1,367 Tags 788 MiB
8b9d12dd47
Commit Graph

79218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wallner
8b9d12dd47 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix some warnings
  PHP-5.6 compatibility for apache2 filter SAPI

Fixes bug #66595
 2014-03-24 17:53:08 +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
12bc572008 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
 2014-03-24 10:32:07 +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
d374c7703c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix C89 compat
 2014-03-22 10:44:40 +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
Andrey Hristov
b418bea1ac Merge branch 'master' of git.php.net:php-src 2014-03-21 14:33:32 +02:00
Nikita Popov
4290293b81 Merge branch 'PHP-5.6' 2014-03-21 01:34:46 +01: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
2b89f618ff Merge branch 'PHP-5.6' 2014-03-21 00:16:03 +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
e3babd3ac3 Merge branch 'PHP-5.6' 2014-03-20 17:29:02 +02:00
Andrey Hristov
113f22550a Fixes after merge 2014-03-20 17:28:49 +02:00
Andrey Hristov
ea93d1fe83 Merge branch 'PHP-5.6' 2014-03-20 17:24:26 +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
3b4fcd3f39 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add info: empty strings are interned
 2014-03-20 15:18:50 +01:00
Remi Collet
7f7c84d64f add info: empty strings are interned 2014-03-20 15:18:41 +01:00
Andrey Hristov
8ed85557e0 Merge branch 'PHP-5.6' 2014-03-20 16:16:27 +02: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
bd9978331f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Add default_charset handling
 2014-03-20 11:04:23 +09:00
Yasuo Ohgaki
8f5a31ff37 Add default_charset handling 2014-03-20 11:03:02 +09: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
122c69a0be Merge branch 'PHP-5.6' 
* PHP-5.6:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
 2014-03-19 15:23:40 -07: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
3406f98439 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing
 2014-03-19 14:13: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
d22d1035cb Merge branch 'PHP-5.6' 2014-03-19 19:15:15 +02:00
Andrey Hristov
62ab3af12f fix compilation error 2014-03-19 19:15:04 +02:00
Andrey Hristov
e756f417b9 Merge branch 'PHP-5.6' 2014-03-19 18:55:40 +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
Adam Harvey
4bac43a520 Merge branch 'PHP-5.6' 2014-03-19 06:25:06 -07:00
Adam Harvey
d613b0acc2 Restore NEWS and UPGRADING for hash_equals(). 2014-03-19 06:24:01 -07:00
Julien Pauli
c4145619be 5.5.11RC1 preparation 2014-03-19 10:43:32 +01:00