clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,419 Commits 494 Branches 1,367 Tags 807 MiB
605b3c2ca1
Commit Graph

76419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antony Dovgal
605b3c2ca1 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #65936 (dangling context pointer causes crash)
 2013-10-21 15:10:15 +04:00
Antony Dovgal
b636c03426 fix bug #65936 (dangling context pointer causes crash) 
reported by Leon Sorokin
 2013-10-21 15:09:29 +04:00
Michael Wallner
4ddbb7dd15 Merge remote-tracking branch 'refs/remotes/origin/master' 
* refs/remotes/origin/master:
  Fixed compilation warning
 2013-10-21 12:23:10 +02:00
Michael Wallner
e78c53680f Merge remote-tracking branch 'refs/remotes/origin/PHP-5.5' into PHP-5.5 
* refs/remotes/origin/PHP-5.5:
  Fixed compilation warning
 2013-10-21 12:23:01 +02:00
Michael Wallner
6764993358 Merge branch 'PHP-5.5' 
* PHP-5.5:
  remove TRAVIS check in test source
  Just SKIP that test on travis
 2013-10-21 12:21:21 +02:00
Michael Wallner
fb610b4e80 remove TRAVIS check in test source 2013-10-21 12:18:58 +02:00
Dmitry Stogov
02214e7a22 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed compilation warning
 2013-10-21 14:18:17 +04:00
Michael Wallner
825174e480 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Just SKIP that test on travis
 2013-10-21 12:18:10 +02:00
Dmitry Stogov
60ce3811ae Fixed compilation warning 2013-10-21 14:17:10 +04:00
Michael Wallner
2ecf94e07e Just SKIP that test on travis 2013-10-21 12:16:41 +02:00
Michael Wallner
454a9fcb14 Merge branch 'master' of https://github.com/guggemand/php-src 
* 'master' of https://github.com/guggemand/php-src:
  Dont reset other counters when incrementing slow_rq
 2013-10-21 12:04:37 +02:00
Michael Wallner
41da537614 Merge branch 'master' of https://github.com/DylanArnold/php-src 
* 'master' of https://github.com/DylanArnold/php-src:
  Call php_module_shutdown() for php-fpm child processes
 2013-10-21 12:04:06 +02:00
Xinchen Hui
aed56fc9a7 Merge branch 'PHP-5.5' 2013-10-21 17:41:03 +08:00
Xinchen Hui
098855433d Fixed issue #115 (path issue when using phar). 2013-10-21 17:40:39 +08:00
Stanislav Malyshev
19e8052be3 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix memory leak on error (from Coverity scan)
 2013-10-21 00:02:33 -07:00
Stanislav Malyshev
cb47396d46 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix memory leak on error (from Coverity scan)
 2013-10-21 00:02:21 -07:00
Stanislav Malyshev
f860486de5 fix memory leak on error (from Coverity scan) 2013-10-21 00:01:24 -07:00
Stanislav Malyshev
ae31a68774 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  fix argument type & remove warning
  fix const warnings in intl methods
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  5.4.21 release date
 2013-10-20 23:04:41 -07:00
Stanislav Malyshev
3900ce97a3 fix argument type & remove warning 2013-10-20 23:04:38 -07:00
Stanislav Malyshev
06954d1bc1 fix const warnings in intl methods 2013-10-20 23:04:38 -07:00
Stanislav Malyshev
444612cdc4 Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 23:04:38 -07:00
Stanislav Malyshev
219a682e8e fix possibility of access to *storedType without initialization 2013-10-20 23:04:38 -07:00
Stanislav Malyshev
00697927d8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
 2013-10-20 23:04:26 -07:00
Stanislav Malyshev
297324146e Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 23:04:16 -07:00
Stanislav Malyshev
27ebcb8d0e 5.4.21 release date 2013-10-20 23:04:16 -07:00
Stanislav Malyshev
8f19a8da65 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
 2013-10-20 23:04:03 -07:00
Stanislav Malyshev
8bef8e66cf fix argument type & remove warning 2013-10-20 22:59:07 -07:00
Stanislav Malyshev
ef9069b4ef fix const warnings in intl methods 2013-10-20 22:32:20 -07:00
Rasmus Lerdorf
ec2e6951b8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
 2013-10-20 22:18:33 -07:00
Rasmus Lerdorf
910d4751e3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
 2013-10-20 22:18:15 -07:00
Rasmus Lerdorf
2186e1583d When src->src is null this doesn't get initialized 
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.
 2013-10-20 22:15:35 -07:00
Stanislav Malyshev
42cb9ac7a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
 2013-10-20 22:05:48 -07:00
Stanislav Malyshev
dab1d76e9d Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 22:04:21 -07:00
Stanislav Malyshev
646813a37a fix possibility of access to *storedType without initialization 2013-10-20 21:57:33 -07:00
Stanislav Malyshev
9aad9114e3 5.4.21 release date 2013-10-20 19:59:39 -07:00
Rasmus Lerdorf
7ccffeea75 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix typo
 2013-10-20 17:56:24 -07:00
Rasmus Lerdorf
9e4651f6f1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix typo
 2013-10-20 17:56:14 -07:00
Rasmus Lerdorf
18cc5386de Fix typo 2013-10-20 17:55:55 -07:00
Rasmus Lerdorf
73e65ea3c9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  These getpwnam('') tests are silly and not portable
 2013-10-20 14:05:29 -07:00
Rasmus Lerdorf
2129de4569 These getpwnam('') tests are silly and not portable 2013-10-20 14:04:47 -07:00
Rasmus Lerdorf
7b2a4c168e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Clean up this weird safe_emalloc() call
 2013-10-20 09:37:40 -07:00
Rasmus Lerdorf
288a4ec3bd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Clean up this weird safe_emalloc() call
 2013-10-20 09:37:25 -07:00
Rasmus Lerdorf
8f4a6d6e1b Clean up this weird safe_emalloc() call 2013-10-20 09:36:50 -07:00
Rasmus Lerdorf
32a729a3ae Merge branch 'PHP-5.5' 
* PHP-5.5:
  Minor Coverity tweaks
 2013-10-20 08:56:41 -07:00
Rasmus Lerdorf
c5e5a6c2ac Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Minor Coverity tweaks
 2013-10-20 08:56:24 -07:00
Rasmus Lerdorf
1494298231 Minor Coverity tweaks 2013-10-20 08:55:48 -07:00
Felipe Pena
048923b3c6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Moved NULL check before dereferencing
 2013-10-20 09:50:17 -02:00
Felipe Pena
8aa19c9fd8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Moved NULL check before dereferencing
 2013-10-20 09:50:13 -02:00
Felipe Pena
9976b5cd7f - Moved NULL check before dereferencing 2013-10-20 09:50:11 -02:00
Felipe Pena
d23f089fb9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - Fixed possible NULL ptr dereference
 2013-10-20 09:04:36 -02:00