php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,487 Commits 549 Branches 1,484 Tags
2b28f29e53f3f4844c19f0113d19f092416396b1
Commit Graph

31291 Commits

Author SHA1 Message Date
Dmitry Stogov 2b28f29e53 Fixed CFG construction bugs 2013-04-09 17:48:45 +04:00
Dmitry Stogov e13d2c7c7f Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  fix possible NULL deref
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
 2013-04-09 12:10:54 +04:00
Pierre Joye 24f1045d55 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix possible NULL deref
 2013-04-09 10:09:47 +02:00
Pierre Joye aab5659357 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix possible NULL deref
 2013-04-09 10:09:36 +02:00
Pierre Joye 88b3cdc4e9 fix possible NULL deref 2013-04-09 10:09:17 +02:00
Pierre Joye 1359eaa057 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-09 10:06:49 +02:00
Pierre Joye 4d6c367177 Merge branch 'PHP-5.4' into PHP-5.5 
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
 2013-04-09 10:04:32 +02:00
Pierre Joye 10d62de4aa Merge branch 'PHP-5.3' into PHP-5.4 
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
 2013-04-09 10:04:17 +02:00
Pierre Joye 4d4adf47e0 fix null deref 2013-04-09 10:04:01 +02:00
Dmitry Stogov 4bf1f3801b Fixed ZTS build 2013-04-09 12:03:41 +04:00
Dmitry Stogov 4cf00c08bd Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function) 2013-04-09 11:57:28 +04:00
Dmitry Stogov d9c9e78369 Fixed issue #82 (allow comments in blacklist file, lines started with ";") 2013-04-09 10:51:19 +04:00
Pierre Joye 83500123d0 ws and comment for recommended aa method 2013-04-09 07:04:52 +02:00
Pierre Joye ec136c219e Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-04-09 06:47:21 +02:00
Pierre Joye 85ad65ef40 fix some unitialized values and typo 2013-04-09 06:44:45 +02:00
Anatol Belski a9f9ff68a2 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch
 2013-04-08 16:24:20 +02:00
Anatol Belski a35d386612 updated libmagic.patch 2013-04-08 16:23:43 +02:00
Anatol Belski b810878e7d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix ident
 2013-04-08 15:51:53 +02:00
Anatol Belski 9de5dcad1c fix ident 2013-04-08 15:51:22 +02:00
Anatol Belski a1f66c0b50 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Refactored the previous memleak fix
 2013-04-08 14:34:09 +02:00
Anatol Belski f3ca1155d6 Refactored the previous memleak fix 
to avoid usage of a freed pointer. Thanks Laruence )
 2013-04-08 14:32:37 +02:00
Anatol Belski 9f0bfed435 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix memory leak at apprentice.c:1095
 2013-04-08 12:50:25 +02:00
Anatol Belski 28e26b0fad fix memory leak at apprentice.c:1095 2013-04-08 12:49:53 +02:00
Anatol Belski 30fc3ac6aa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed EOL
 2013-04-08 09:21:06 +02:00
Anatol Belski b0b81c0a37 fixed EOL 2013-04-08 09:20:43 +02:00
Anatol Belski b12f79cafb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  upgraded libmagic to 5.14
 2013-04-07 22:18:53 +02:00
Anatol Belski 10367fa7c6 upgraded libmagic to 5.14 2013-04-07 22:15:56 +02:00
Xinchen Hui 5ac8084e5f Merge branch 'PHP-5.4' into PHP-5.5 2013-04-05 23:28:02 +08:00
Carson McDonald 39bc1bd25f Fix typo 2013-04-05 23:27:34 +08:00
Johannes Schlüter 9587cf385e Improve warning when trying to load zend ext as PHP module 2013-04-04 15:36:46 +02:00
Xinchen Hui 01ca2bf8c3 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/curl/interface.c
 2013-04-04 19:31:14 +08:00
Xinchen Hui 185e5e15ae s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED, 2013-04-04 19:28:17 +08:00
Xinchen Hui bbb4a44f98 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-03 18:51:19 +08:00
ptarjan 99ad08f9a5 Fix #64572: Clean up after the test 
Lets not leave stuff lying around.
 2013-04-03 18:50:27 +08:00
Xinchen Hui 6ace9c646b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/curl/interface.c
 2013-04-03 10:15:41 +08:00
Xinchen Hui 78a9489f6a Use new constant replace ugly trick 2013-04-03 10:12:49 +08:00
Xinchen Hui d7f709a032 Add CURL_WRAPPERS_ENABLE constant 
see http://news.php.net/php.internals/66871
 2013-04-03 10:09:51 +08:00
Dmitry Stogov 23b44e7f39 Fixed ZTS build 2013-04-01 21:16:33 +04:00
Xinchen Hui d8a5f41a60 Fixed bug parameter is casted to string of array_column 2013-04-01 19:11:45 +08:00
Xinchen Hui 9456dac54e Fix test 2013-04-01 18:12:16 +08:00
Dmitry Stogov 74f158fb9d Fixed issue #79 (Optimization Problem/Bug) 2013-04-01 11:33:04 +04:00
Xinchen Hui ad7c0b1928 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-31 21:26:26 +08:00
Xinchen Hui 72426a446d Skip test when --with-curlwrappers enabled. 2013-03-31 21:22:48 +08:00
Xinchen Hui 2f6b9b970c Fix typo (it's in DateTime::__wakeup) 2013-03-31 20:07:14 +08:00
Derick Rethans 503760c913 Updated test case and added BFN to NEWS. 2013-03-31 11:07:24 +01:00
EC2 Default User b07ecb5501 Bug #60774 (DateInterval::format("%a") is always zero when an interval is 
created using the createFromDateString method)
 2013-03-31 10:59:21 +01:00
Derick Rethans 84208d9dc5 Added the new .c files as well as they are not automatically regenerated. 2013-03-31 10:55:45 +01:00
Lonny Kapelushnik 58a8013e5f Rebased to PHP-5.4 
Implemented Dmitrys change from df97c3aa0d
Moved the timelib_parse_tz_cor function to ext/date/lib/timelib.c
 2013-03-31 10:45:01 +01:00
Lonny Kapelushnik a4ca01cc2b Made separate tests for each TZ type 
Fixed handling of unserializing types 1 and 3
 2013-03-31 10:45:00 +01:00
Lonny Kapelushnik a1ebd82a29 Fixed the test to use %d instead of an actual number 2013-03-31 10:45:00 +01:00