clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,671 Commits 491 Branches 1,363 Tags 846 MiB
03bf8c256b
Commit Graph

84671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
03bf8c256b fix type 2014-09-12 21:35:22 +02:00
Anatol Belski
e68788745a fix type 2014-09-12 21:35:21 +02:00
Anatol Belski
5d5a70205c reduce the struct size by 8 byte on 64 bit 2014-09-12 21:35:20 +02:00
Anatol Belski
7ea780dd6e fix type 2014-09-12 21:35:19 +02:00
Anatol Belski
9adf0c8e07 better alignment, reduced the struct by 8 byte on 64 bit 2014-09-12 21:35:18 +02:00
Anatol Belski
10f856386d fix type 2014-09-12 21:35:17 +02:00
Xinchen Hui
243ec132e6 Forget to commit this part... 2014-09-13 02:00:15 +08:00
Xinchen Hui
78ce2557f5 Finally!!! Fixed segfault in GC 
this must not be the final fix, but let's stop the segfault first and
use this to indicate where the problem is.

reproduced by phpspec
 2014-09-13 01:55:49 +08:00
Anatol Belski
4db2181d4e make this test a bit more tolerant when checking sleep time 2014-09-12 14:39:19 +02:00
Anatol Belski
99fb5d0ea8 remove extra semicolon 2014-09-12 14:39:18 +02:00
Anatol Belski
69d6e093e9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed the cast and incompatible pointer warning

Conflicts:
	sapi/cgi/fastcgi.c
 2014-09-12 14:37:54 +02:00
Anatol Belski
bcdbd47117 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixed the cast and incompatible pointer warning
 2014-09-12 14:36:54 +02:00
Anatol Belski
fdfc31a4f7 fixed the cast and incompatible pointer warning 2014-09-12 14:36:00 +02:00
Anatol Belski
0292c34b05 Merge branch 'PHP-5.6' 
* PHP-5.6:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
  5.6.2 now

Conflicts:
	configure.in
	main/php_version.h
 2014-09-11 23:33:12 +02:00
Anatol Belski
13280a9e36 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
 2014-09-11 23:31:16 +02:00
Anatol Belski
69ea7f9509 reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0 2014-09-11 23:30:01 +02:00
Julien Pauli
8ff79d3e89 5.6.2 now 2014-09-11 18:37:25 +02:00
Dmitry Stogov
8527657ca6 Fixed refcounting for references 2014-09-11 19:12:12 +04:00
Nikita Popov
7014dec761 Don't show TEST line if SHOW_ONLY_GROUPS is used 2014-09-11 16:27:53 +02:00
Nikita Popov
fca85d92cc Fix ext/dba ini handling 
Doing this change blindly based on gcov output
 2014-09-11 16:06:31 +02:00
Dmitry Stogov
b8c36e199e Simplify ASSIGN code 2014-09-11 17:00:06 +04:00
Nikita Popov
e2d4d700cf Fix yy_limit computation after encoding switch 
The three assignments above this line are still broken - they assume
that byte offsets in one encoding directly map to byte offsets in
another encoding.

I'm fixing the length here because it is the one causing out-of-bounds
reads and is easy to fix. For the others we'd have to actually compute
new offsets.
 2014-09-11 14:52:59 +02:00
Nikita Popov
f017843df3 Remove self-contradictory zend multibyte assertion 
Code that explicitly exists to handle an incompatible internal
encoding should not assert that the internal encoding is compatible.
 2014-09-11 14:52:59 +02:00
Dmitry Stogov
82096dc151 Removed ZEND_QM_ASSIGN_VAR and ZEND_JMP_SET_VAR opcodes (in PHPNG they did exacly the same as ZEND_QM_ASSIGN and ZEND_JMP_SET) 2014-09-11 12:29:54 +04:00
Dmitry Stogov
1981dd9c73 Revert "Removing ext/ereg and dependencies" 
This reverts commit 86de7963fe.
 2014-09-11 11:06:57 +04:00
Dmitry Stogov
98b8050433 Revert "Updated UPGRADING for ext/ereg removal" 
This reverts commit 610ef5d7ec.
 2014-09-11 11:06:47 +04:00
Tjerk Meesters
610ef5d7ec Updated UPGRADING for ext/ereg removal 2014-09-11 10:22:44 +08:00
Tjerk Meesters
86de7963fe Removing ext/ereg and dependencies 
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')

SAPI:
- apache (header only)
- apache_hooks (header only)
 2014-09-11 10:22:44 +08:00
Anatol Belski
e699f654f0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:32:25 +02:00
Anatol Belski
0b89bb83ba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:31:59 +02:00
Anatol Belski
dff820cea3 fix precision when fetching float through mysqlnd 
fixes failing ext/mysqli/tests/010.phpt
 2014-09-10 19:29:11 +02:00
Michael Wallner
80ef586541 Merge branch 'PHP-5.6' 
* PHP-5.6:
  make LTP version check a blacklist
 2014-09-10 13:31:39 +02:00
Michael Wallner
4f2563329b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  make LTP version check a blacklist
 2014-09-10 13:31:22 +02:00
Michael Wallner
3b78a24ee9 make LTP version check a blacklist 2014-09-10 13:30:52 +02:00
Anatol Belski
466a4c97b2 replace zend_hash_find with zend_hash_str_find which fixes leaking the key 2014-09-10 13:22:23 +02:00
Anatol Belski
e3ded277a5 second big shot on porting ext/oci8 
still a lot to do, but most raw things done
 2014-09-10 12:41:43 +02:00
Anatol Belski
686213a242 first shot on fixing ext/oci8 2014-09-10 12:41:42 +02:00
Anatol Belski
2e085df5c0 basic datatype fixes for ext/oci8 2014-09-10 12:41:41 +02:00
Dmitry Stogov
c07a0dbcb9 Don't miss warning messages 2014-09-10 13:02:01 +04:00
Matteo Beccati
205b6b8a13 Merge branch 'PHP-5.6' 
* PHP-5.6:
  FR #67990 - Added nowait argument to sem_acquire
 2014-09-10 07:32:36 +02:00
Matteo Beccati
0b648a424f FR #67990 - Added nowait argument to sem_acquire 2014-09-10 07:31:25 +02:00
Stanislav Malyshev
5b8243014f Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
 2014-09-09 16:20:20 -07:00
Stanislav Malyshev
3571a68ab9 update NEWS 2014-09-09 16:11:32 -07:00
Daniel Lowrey
13695a5ead Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:25:36 -06:00
Daniel Lowrey
edb2799333 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:24:40 -06:00
Daniel Lowrey
bf2f80b223 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a Bug #41631: Fix regression from first attempt (6569db8) 2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4 Bug #67965: Fix blocking behavior in non-blocking crypto streams 2014-09-09 07:37:57 -06:00
Tjerk Meesters
b192ff155d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed #67985 - Incorrect last used array index copied to new array after unset

Conflicts:
	Zend/zend_variables.c
 2014-09-09 19:32:09 +08:00
Tjerk Meesters
da7c87e2f8 Updated NEWS for #67985 2014-09-09 18:04:09 +08:00