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
76,901 Commits 547 Branches 1,483 Tags
ba15e8dfd0bbe65fd7022f55cf5bdaca413d96e4
Commit Graph

195 Commits

Author SHA1 Message Date
Stanislav Malyshev
0cb9d75cb6 Merge branch 'PHP-5.4.40' into PHP-5.5.24 
* PHP-5.4.40:
  Additional fix for bug #69324
  More fixes for bug #69152
  Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
  Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
  Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
  Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
  Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
  Fixed bug #68901 (use after free)
  Fixed bug #68740 (NULL Pointer Dereference)
  Fix bug #66550 (SQLite prepared statement use-after-free)
  Better fix for #68601 for perf 81e9a993f2
  Fix bug #68601 buffer read overflow in gd_gif_in.c
  Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
  Fixed bug #69293
  Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
 2015-04-11 16:56:12 -07:00
Xinchen Hui
9a404df382 Fixed bug #68740 (NULL Pointer Dereference) 
(cherry picked from commit 124fb22a13)
 2015-04-05 22:48:10 -07:00
Stanislav Malyshev
bf2f03ddb3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:10:05 -07:00
Stanislav Malyshev
fb04dcf6db Fix bug #69248 - heap overflow vulnerability in regcomp.c 
Merged from 70bc296560
 2015-03-17 17:04:57 -07:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  typofixes
 2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Xinchen Hui
505c6ca486 Fixed bug #64290 (behavior change of converting to long) 
convert_to_long behavior has been improved
As Cataphrace said in IRC, the test should be fixed.
 2013-03-03 10:59:15 +08:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Stanislav Malyshev
d81ea16ef1 Changed silent conversion of array to string to produce a notice. (Patrick) 2011-10-21 06:08:47 +00:00
Stanislav Malyshev
ed12ebc79c Changed silent conversion of array to string to produce a notice. (Patrick) 2011-10-21 06:08:47 +00:00
Xinchen Hui
fa1883de19 Omitted GCC warning "comparison is always false" 2011-08-12 07:47:03 +00:00
Xinchen Hui
ba9546b8e5 Omitted GCC warning "comparison is always false" 2011-08-12 07:47:03 +00:00
Xinchen Hui
e780e7bfb9 Recored change into regex.patch 2011-08-11 07:52:04 +00:00
Pierre Joye
a6a81e29d5 - fix build (introduce by r314641) 2011-08-11 07:11:39 +00:00
Pierre Joye
a652bb991d - fix build (introduce by r314641) 2011-08-11 07:11:39 +00:00
Xinchen Hui
64fc565765 Avoiding strcpy, strcat, sprintf usage to make static analyzer happy 2011-08-09 12:16:58 +00:00
Xinchen Hui
5dc3195897 Avoiding strcpy, strcat, sprintf usage to make static analyzer happy 2011-08-09 12:16:58 +00:00
Xinchen Hui
c109640b1a Avoiding strcpy usage, Make static analyzer happy 2011-08-09 09:35:42 +00:00
Xinchen Hui
571427c7db Avoiding strcpy usage, Make static analyzer happy 2011-08-09 09:35:42 +00:00
Rasmus Lerdorf
5a448d23b2 These naked strcpy()s scare me 2011-08-07 00:18:38 +00:00
Rasmus Lerdorf
c70aa9436a These naked strcpy()s scare me 2011-08-07 00:18:38 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Kalle Sommer Nielsen
a6adb25d85 Eliminate a TSRMLS_FETCH() call in case of an error in one of the ereg functions 2010-09-23 04:51:02 +00:00
Kalle Sommer Nielsen
1cabc8cd3a Allow ereg to be built as shared on Windows 
## I know that we may remove ereg in trunk, but since the core doesn't depend on 
## ereg, then I don't see any reason not to allow this
 2010-05-24 07:44:00 +00:00
Kalle Sommer Nielsen
7ef4cdf471 Remove a couple TSRMLS_FETCH() calls around ext/main/sapi 2010-04-13 11:02:15 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Matt Wilmas
26cde1ee2f MFH: Updated tests after double->long conversion change (basically to match 5.2) 
# Let me know about other failing tests I missed
 2009-06-04 18:25:06 +00:00
Scott MacVicar
4044f880e8 MFH: Fix bug #48416 - Force a cache size for ereg to stop it getting out of control. Lazy LRU here. 2009-05-28 21:57:24 +00:00
Ilia Alshanetsky
9ce52853c7 Simplify parameter parsing 2009-01-08 00:37:39 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Felipe Pena
63f6f500a7 - Fixed tests 2008-11-29 22:45:48 +00:00
Ant Phillips
587363da3c Latest and greatest versions of these session tests - checked on 5.2.X snap on Windows, Linux and Linux 64 bit. 2008-11-27 14:39:33 +00:00
Felipe Pena
277c3e4172 - Fixed tests 2008-11-20 13:31:34 +00:00
Felipe Pena
1881091e0f - Deprecate ereg 2008-11-18 17:55:07 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Alexey Zakhlestin
5058774e1f propagated const, to avoid "discards qualifiers from pointer target type" errors 2008-10-16 11:38:25 +00:00
Jani Taskinen
07586f682b MFH:- Visibility (bug #45564) 2008-07-21 16:23:00 +00:00
Felipe Pena
44fe6a6005 - Fixed tests 2008-06-22 19:16:44 +00:00